You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/12/07 15:55:06 UTC
[shardingsphere] 01/01: Revert "Rename `MetaData` to `Metadata` for mode module. (#22704)"
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch revert-22704-dev-2215501
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
commit 171d9db3fa8b8c2fbc276681b8fd2a17b88a1212
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed Dec 7 23:54:57 2022 +0800
Revert "Rename `MetaData` to `Metadata` for mode module. (#22704)"
This reverts commit 1a191f8605545cf06d10d5f5cd45067c9de12039.
---
.../collector/MetaDataInfoCollector.java | 12 +-
.../collector/ProxyInfoCollectorTest.java | 8 +-
.../service/PrometheusPluginBootServiceTest.java | 8 +-
docs/document/content/dev-manual/mode.cn.md | 2 +-
docs/document/content/dev-manual/mode.en.md | 2 +-
.../driver/executor/DriverExecutor.java | 14 +-
.../driver/executor/DriverJDBCExecutor.java | 14 +-
.../batch/BatchPreparedStatementExecutor.java | 14 +-
.../jdbc/adapter/AbstractResultSetAdapter.java | 2 +-
.../jdbc/adapter/AbstractStatementAdapter.java | 6 +-
.../jdbc/core/connection/ConnectionManager.java | 10 +-
.../metadata/ShardingSphereDatabaseMetaData.java | 6 +-
.../statement/ShardingSpherePreparedStatement.java | 92 +++---
.../core/statement/ShardingSphereStatement.java | 112 ++++----
.../driver/executor/AbstractBaseExecutorTest.java | 16 +-
.../batch/BatchPreparedStatementExecutorTest.java | 2 +-
.../driver/jdbc/adapter/ConnectionAdapterTest.java | 2 +-
.../jdbc/adapter/PreparedStatementAdapterTest.java | 14 +-
.../driver/jdbc/adapter/StatementAdapterTest.java | 10 +-
.../core/connection/ConnectionManagerTest.java | 12 +-
.../connection/ShardingSphereConnectionTest.java | 2 +-
.../datasource/ShardingSphereDataSourceTest.java | 6 +-
.../ShardingSphereDatabaseMetaDataTest.java | 8 +-
.../resultset/ShardingSphereResultSetTest.java | 8 +-
.../statement/EncryptPreparedStatementTest.java | 2 +-
.../jdbc/core/statement/EncryptStatementTest.java | 2 +-
.../UnsupportedOperationConnectionTest.java | 2 +-
.../UnsupportedOperationPreparedStatementTest.java | 6 +-
.../UnsupportedOperationStatementTest.java | 4 +-
.../driver/state/DriverStateContextTest.java | 10 +-
.../driver/state/ok/OKDriverStateTest.java | 2 +-
.../data/pipeline/core/api/PipelineAPIFactory.java | 2 +-
.../core/execute/ShardingSphereDataJobWorker.java | 2 +-
.../ShardingSphereDataScheduleCollector.java | 4 +-
.../core/prepare/PipelineJobPreparerUtils.java | 2 +-
.../spi/impl/PipelineDistributedBarrierImpl.java | 2 +-
.../execute/ShardingSphereDataCollectorTest.java | 6 +-
.../migration/api/impl/MigrationJobAPIImpl.java | 2 +-
.../mode/manager/ContextManager.java | 308 ++++++++++-----------
.../manager/switcher/ResourceSwitchManager.java | 6 +-
...MetadataContexts.java => MetaDataContexts.java} | 30 +-
...tsFactory.java => MetaDataContextsFactory.java} | 30 +-
...istService.java => MetaDataPersistService.java} | 20 +-
.../data/ShardingSphereDataPersistService.java | 9 +-
...MetadataNode.java => DatabaseMetaDataNode.java} | 100 +++----
.../persist/node/ShardingSphereDataNode.java | 18 +-
...ce.java => DatabaseMetaDataPersistService.java} | 50 ++--
...ice.java => MetaDataVersionPersistService.java} | 16 +-
.../config/database/DataSourcePersistService.java | 16 +-
.../database/DatabaseRulePersistService.java | 18 +-
...vice.java => SchemaMetaDataPersistService.java} | 12 +-
...rvice.java => TableMetaDataPersistService.java} | 14 +-
...ervice.java => ViewMetaDataPersistService.java} | 18 +-
.../mode/manager/ContextManagerTest.java | 198 ++++++-------
...yTest.java => MetaDataContextsFactoryTest.java} | 50 ++--
...ContextsTest.java => MetaDataContextsTest.java} | 8 +-
...ceTest.java => MetaDataPersistServiceTest.java} | 14 +-
...NodeTest.java => DatabaseMetaDataNodeTest.java} | 50 ++--
...ava => DatabaseMetaDataPersistServiceTest.java} | 22 +-
...java => MetaDataVersionPersistServiceTest.java} | 32 +--
...t.java => TableMetaDataPersistServiceTest.java} | 10 +-
...st.java => ViewMetaDataPersistServiceTest.java} | 12 +-
.../cluster/ClusterContextManagerBuilder.java | 30 +-
.../cluster/coordinator/RegistryCenter.java | 4 +-
...edEvent.java => TableMetaDataChangedEvent.java} | 6 +-
...gedEvent.java => ViewMetaDataChangedEvent.java} | 6 +-
....java => SchemaMetaDataRegistrySubscriber.java} | 14 +-
...gedWatcher.java => MetaDataChangedWatcher.java} | 68 ++---
.../subscriber/ConfigurationChangedSubscriber.java | 12 +-
.../subscriber/ContextManagerSubscriberFacade.java | 6 +-
...java => ResourceMetaDataChangedSubscriber.java} | 28 +-
.../subscriber/StateChangedSubscriber.java | 10 +-
....cluster.coordinator.registry.GovernanceWatcher | 2 +-
...a => SchemaMetaDataRegistrySubscriberTest.java} | 22 +-
...erTest.java => MetaDataChangedWatcherTest.java} | 8 +-
.../ConfigurationChangedSubscriberTest.java | 34 +--
.../ProcessListChangedSubscriberTest.java | 6 +-
... => ResourceMetaDataChangedSubscriberTest.java} | 50 ++--
.../subscriber/StateChangedSubscriberTest.java | 8 +-
.../repository/cluster/nacos/NacosRepository.java | 30 +-
.../nacos/listener/NamingEventListener.java | 20 +-
...cosMetadataUtil.java => NacosMetaDataUtil.java} | 4 +-
.../cluster/nacos/NacosRepositoryTest.java | 20 +-
.../StandaloneContextManagerBuilder.java | 14 +-
.../StandaloneContextManagerBuilderTextTest.java | 10 +-
.../communication/DatabaseCommunicationEngine.java | 4 +-
.../backend/communication/ProxySQLExecutor.java | 12 +-
.../communication/ReactiveProxySQLExecutor.java | 4 +-
.../jdbc/JDBCDatabaseCommunicationEngine.java | 42 +--
.../jdbc/datasource/JDBCBackendDataSource.java | 6 +-
.../jdbc/executor/ProxyJDBCExecutor.java | 6 +-
.../callback/ProxyJDBCExecutorCallback.java | 6 +-
...ySQLStatementMemoryStrictlyFetchSizeSetter.java | 2 +-
...eSQLStatementMemoryStrictlyFetchSizeSetter.java | 2 +-
.../transaction/JDBCBackendTransactionManager.java | 2 +-
.../vertx/VertxBackendDataSource.java | 2 +-
.../vertx/VertxDatabaseCommunicationEngine.java | 2 +-
.../backend/context/BackendExecutorContext.java | 2 +-
.../proxy/backend/context/ProxyContext.java | 12 +-
.../handler/ProxyBackendHandlerFactory.java | 18 +-
.../executor/AbstractDatabaseMetadataExecutor.java | 6 +-
.../admin/mysql/MySQLAdminExecutorCreator.java | 2 +-
.../admin/mysql/MySQLSetVariableAdminExecutor.java | 8 +-
.../mysql/executor/ShowCurrentUserExecutor.java | 2 +-
.../mysql/executor/ShowDatabasesExecutor.java | 4 +-
.../executor/UnicastResourceShowExecutor.java | 2 +-
.../admin/mysql/executor/UseDatabaseExecutor.java | 4 +-
.../SelectInformationSchemataExecutor.java | 2 +-
.../executor/SelectDatabaseExecutor.java | 2 +-
.../data/impl/UnicastDatabaseBackendHandler.java | 2 +-
.../database/DropDatabaseBackendHandler.java | 4 +-
.../ral/QueryableGlobalRuleRALBackendHandler.java | 2 +-
.../ral/UpdatableGlobalRuleRALBackendHandler.java | 8 +-
.../distsql/ral/hint/HintRALBackendHandler.java | 2 +-
.../ral/queryable/ShowDistVariableHandler.java | 2 +-
.../ral/queryable/ShowDistVariablesHandler.java | 2 +-
...owStatusFromReadwriteSplittingRulesHandler.java | 12 +-
...SplittingStorageUnitStatusStatementHandler.java | 12 +-
.../ImportDatabaseConfigurationHandler.java | 10 +-
.../ral/updatable/LabelComputeNodeHandler.java | 4 +-
.../updatable/RefreshDatabaseMetadataHandler.java | 2 +-
.../ral/updatable/RefreshTableMetadataHandler.java | 2 +-
.../ral/updatable/SetDistVariableHandler.java | 10 +-
.../ral/updatable/UnlabelComputeNodeHandler.java | 4 +-
.../rdl/rule/RuleDefinitionBackendHandler.java | 6 +-
.../distsql/rul/sql/ParseDistSQLHandler.java | 2 +-
.../handler/distsql/rul/sql/PreviewHandler.java | 36 +--
.../proxy/backend/session/ConnectionSession.java | 4 +-
.../DatabaseCommunicationEngineFactoryTest.java | 8 +-
.../communication/ProxySQLExecutorTest.java | 8 +-
.../jdbc/JDBCDatabaseCommunicationEngineTest.java | 8 +-
.../jdbc/connection/JDBCBackendConnectionTest.java | 8 +-
.../jdbc/datasource/JDBCBackendDataSourceTest.java | 8 +-
...StatementMemoryStrictlyFetchSizeSetterTest.java | 4 +-
...StatementMemoryStrictlyFetchSizeSetterTest.java | 2 +-
...StatementMemoryStrictlyFetchSizeSetterTest.java | 2 +-
.../JDBCBackendTransactionManagerTest.java | 2 +-
.../context/BackendExecutorContextTest.java | 8 +-
.../proxy/backend/context/ProxyContextTest.java | 26 +-
.../handler/ProxyBackendHandlerFactoryTest.java | 18 +-
.../DatabaseAdminQueryBackendHandlerTest.java | 8 +-
.../DatabaseOperateBackendHandlerFactoryTest.java | 24 +-
.../DefaultDatabaseMetadataExecutorTest.java | 12 +-
.../admin/mysql/MySQLAdminExecutorCreatorTest.java | 8 +-
.../mysql/MySQLSetVariableAdminExecutorTest.java | 6 +-
.../executor/ShowCreateDatabaseExecutorTest.java | 8 +-
.../executor/ShowCurrentUserExecutorTest.java | 8 +-
.../mysql/executor/ShowDatabasesExecutorTest.java | 8 +-
.../executor/ShowFunctionStatusExecutorTest.java | 8 +-
.../executor/ShowProcedureStatusExecutorTest.java | 8 +-
.../mysql/executor/ShowTablesExecutorTest.java | 8 +-
.../mysql/executor/UseDatabaseExecutorTest.java | 12 +-
.../SelectInformationSchemataExecutorTest.java | 14 +-
.../executor/SelectDatabaseExecutorTest.java | 12 +-
.../executor/SelectTableExecutorTest.java | 10 +-
.../data/DatabaseBackendHandlerFactoryTest.java | 4 +-
.../impl/UnicastDatabaseBackendHandlerTest.java | 8 +-
.../database/CreateDatabaseBackendHandlerTest.java | 8 +-
.../database/DropDatabaseBackendHandlerTest.java | 18 +-
.../distsql/DistSQLBackendHandlerFactoryTest.java | 16 +-
.../ral/advance/ParseDistSQLHandlerTest.java | 2 +-
.../ExportDatabaseConfigurationHandlerTest.java | 10 +-
.../ShowDistVariableBackendHandlerTest.java | 10 +-
.../queryable/ShowDistVariablesHandlerTest.java | 12 +-
.../queryable/ShowTableMetadataHandlerTest.java | 6 +-
.../ImportDatabaseConfigurationHandlerTest.java | 12 +-
.../updatable/RefreshTableMetadataHandlerTest.java | 2 +-
.../SetDistVariableBackendHandlerTest.java | 8 +-
.../ral/updatable/SetDistVariableExecutorTest.java | 10 +-
.../AlterStorageUnitBackendHandlerTest.java | 16 +-
.../RegisterStorageUnitBackendHandlerTest.java | 24 +-
.../UnregisterStorageUnitBackendHandlerTest.java | 20 +-
.../handler/distsql/rql/RQLBackendHandlerTest.java | 10 +-
.../rql/RuleDefinitionBackendHandlerTest.java | 4 +-
.../TransactionBackendHandlerFactoryTest.java | 2 +-
.../transaction/TransactionBackendHandlerTest.java | 2 +-
.../backend/session/ConnectionSessionTest.java | 2 +-
.../proxy/version/ShardingSphereProxyVersion.java | 2 +-
.../version/ShardingSphereProxyVersionTest.java | 6 +-
.../proxy/frontend/ShardingSphereProxy.java | 6 +-
.../frontend/command/CommandExecutorTask.java | 2 +-
.../connection/ConnectionLimitContext.java | 2 +-
.../frontend/netty/CDCChannelInboundHandler.java | 2 +-
.../netty/FrontendChannelInboundHandler.java | 2 +-
.../protocol/FrontDatabaseProtocolTypeFactory.java | 10 +-
.../proxy/frontend/state/ProxyStateContext.java | 2 +-
.../frontend/state/impl/JDBCOKProxyState.java | 4 +-
.../frontend/command/CommandExecutorTaskTest.java | 6 +-
.../connection/ConnectionLimitContextTest.java | 4 +-
.../netty/CDCChannelInboundHandlerTest.java | 2 +-
.../netty/FrontendChannelInboundHandlerTest.java | 2 +-
.../FrontDatabaseProtocolTypeFactoryTest.java | 32 +--
.../frontend/state/impl/JDBCOKProxyStateTest.java | 12 +-
.../proxy/frontend/mysql/MySQLFrontendEngine.java | 2 +-
.../mysql/command/MySQLCommandExecuteEngine.java | 8 +-
.../admin/initdb/MySQLComInitDbExecutor.java | 4 +-
.../prepare/MySQLComStmtPrepareExecutor.java | 10 +-
.../fieldlist/MySQLComFieldListPacketExecutor.java | 8 +-
.../text/query/MySQLComQueryPacketExecutor.java | 6 +-
.../text/query/MySQLMultiStatementsHandler.java | 26 +-
.../frontend/mysql/MySQLFrontendEngineTest.java | 12 +-
.../MySQLAuthenticationEngineTest.java | 8 +-
.../MySQLAuthenticationHandlerTest.java | 12 +-
.../command/MySQLCommandExecutorFactoryTest.java | 8 +-
.../execute/MySQLComStmtExecuteExecutorTest.java | 8 +-
.../prepare/MySQLComStmtPrepareExecutorTest.java | 10 +-
.../query/MySQLComQueryPacketExecutorTest.java | 10 +-
.../query/MySQLMultiStatementsHandlerTest.java | 14 +-
.../OpenGaussAuthenticationEngine.java | 2 +-
.../OpenGaussAuthenticationHandler.java | 4 +-
.../OpenGaussAuthenticationEngineTest.java | 12 +-
.../OpenGaussAuthenticationHandlerTest.java | 12 +-
.../bind/OpenGaussComBatchBindExecutorTest.java | 10 +-
.../PostgreSQLAuthenticationHandler.java | 4 +-
.../command/PostgreSQLCommandExecuteEngine.java | 2 +-
.../PostgreSQLBatchedStatementsExecutor.java | 24 +-
.../describe/PostgreSQLComDescribeExecutor.java | 8 +-
.../extended/parse/PostgreSQLComParseExecutor.java | 10 +-
.../PostgreSQLAuthenticationEngineTest.java | 12 +-
.../PostgreSQLAuthenticationHandlerTest.java | 12 +-
.../PostgreSQLCommandExecuteEngineTest.java | 6 +-
.../command/query/extended/JDBCPortalTest.java | 4 +-
...egatedBatchedStatementsCommandExecutorTest.java | 10 +-
.../PostgreSQLBatchedStatementsExecutorTest.java | 10 +-
.../bind/PostgreSQLComBindExecutorTest.java | 2 +-
.../PostgreSQLComDescribeExecutorTest.java | 14 +-
.../parse/PostgreSQLComParseExecutorTest.java | 18 +-
.../ReactiveMySQLComStmtExecuteExecutor.java | 10 +-
.../ReactiveMySQLComFieldListPacketExecutor.java | 8 +-
.../pipeline/core/util/PipelineContextUtil.java | 16 +-
.../util/PipelineDistributedBarrierImplTest.java | 4 +-
231 files changed, 1550 insertions(+), 1551 deletions(-)
diff --git a/agent/plugins/metrics/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/MetaDataInfoCollector.java b/agent/plugins/metrics/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/MetaDataInfoCollector.java
index 99f2265189a..dabb9e84844 100644
--- a/agent/plugins/metrics/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/MetaDataInfoCollector.java
+++ b/agent/plugins/metrics/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/MetaDataInfoCollector.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.agent.metrics.api.util.MetricsUtil;
import org.apache.shardingsphere.agent.metrics.prometheus.wrapper.PrometheusWrapperFactory;
import org.apache.shardingsphere.infra.datasource.props.DataSourcePropertiesCreator;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import javax.sql.DataSource;
@@ -64,14 +64,14 @@ public final class MetaDataInfoCollector extends Collector {
}
private void collectProxy(final GaugeMetricFamily metricFamily) {
- MetadataContexts metadataContexts = ProxyContext.getInstance().getContextManager().getMetadataContexts();
- metricFamily.addMetric(Collections.singletonList(LOGIC_DB_COUNT), metadataContexts.getMetadata().getDatabases().size());
- metricFamily.addMetric(Collections.singletonList(ACTUAL_DB_COUNT), getDatabaseNames(metadataContexts).size());
+ MetaDataContexts metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
+ metricFamily.addMetric(Collections.singletonList(LOGIC_DB_COUNT), metaDataContexts.getMetaData().getDatabases().size());
+ metricFamily.addMetric(Collections.singletonList(ACTUAL_DB_COUNT), getDatabaseNames(metaDataContexts).size());
}
- private Collection<String> getDatabaseNames(final MetadataContexts metadataContexts) {
+ private Collection<String> getDatabaseNames(final MetaDataContexts metaDataContexts) {
Collection<String> result = new HashSet<>();
- for (ShardingSphereDatabase each : metadataContexts.getMetadata().getDatabases().values()) {
+ for (ShardingSphereDatabase each : metaDataContexts.getMetaData().getDatabases().values()) {
result.addAll(getDatabaseNames(each));
}
return result;
diff --git a/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/ProxyInfoCollectorTest.java b/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/ProxyInfoCollectorTest.java
index 127b263325d..8d9f7d803e0 100644
--- a/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/ProxyInfoCollectorTest.java
+++ b/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/ProxyInfoCollectorTest.java
@@ -27,8 +27,8 @@ import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.manager.standalone.workerid.generator.StandaloneWorkerIdGenerator;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.junit.Test;
@@ -39,11 +39,11 @@ public final class ProxyInfoCollectorTest extends ProxyContextRestorer {
@Test
public void assertCollect() {
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class), new ShardingSphereMetaData());
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class), new ShardingSphereMetaData());
InstanceContext instanceContext = new InstanceContext(
new ComputeNodeInstance(mock(InstanceMetaData.class)), new StandaloneWorkerIdGenerator(), new ModeConfiguration("Standalone", null), mock(LockContext.class),
new EventBusContext());
- ProxyContext.init(new ContextManager(metadataContexts, instanceContext));
+ ProxyContext.init(new ContextManager(metaDataContexts, instanceContext));
assertFalse(new ProxyInfoCollector().collect().isEmpty());
}
}
diff --git a/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/service/PrometheusPluginBootServiceTest.java b/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/service/PrometheusPluginBootServiceTest.java
index 9a26e333d23..6f44055c8c9 100644
--- a/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/service/PrometheusPluginBootServiceTest.java
+++ b/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/service/PrometheusPluginBootServiceTest.java
@@ -28,8 +28,8 @@ import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.manager.standalone.workerid.generator.StandaloneWorkerIdGenerator;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.junit.AfterClass;
import org.junit.Test;
@@ -52,11 +52,11 @@ public final class PrometheusPluginBootServiceTest extends ProxyContextRestorer
@Test
public void assertStart() throws IOException {
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class), new ShardingSphereMetaData());
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class), new ShardingSphereMetaData());
InstanceContext instanceContext = new InstanceContext(
new ComputeNodeInstance(mock(InstanceMetaData.class)), new StandaloneWorkerIdGenerator(), new ModeConfiguration("Standalone", null), mock(LockContext.class),
new EventBusContext());
- ProxyContext.init(new ContextManager(metadataContexts, instanceContext));
+ ProxyContext.init(new ContextManager(metaDataContexts, instanceContext));
PROMETHEUS_PLUGIN_BOOT_SERVICE.start(new PluginConfiguration("localhost", 8090, "", createProperties()), true);
new Socket().connect(new InetSocketAddress("localhost", 8090));
}
diff --git a/docs/document/content/dev-manual/mode.cn.md b/docs/document/content/dev-manual/mode.cn.md
index 6dcfc061a92..1670dd68b69 100644
--- a/docs/document/content/dev-manual/mode.cn.md
+++ b/docs/document/content/dev-manual/mode.cn.md
@@ -56,6 +56,6 @@ chapter = true
| ----------------------------------------------------------------------- | --------------------------------------| ---------------------------- |
| Types: ADDED, UPDATED, DELETED; WatchingKeys: /nodes/compute_nodes | 计算节点状态变化监听器 | [`org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.watcher.ComputeNodeStateChangedWatcher`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/watcher/ComputeNodeStateChangedWatcher.java) |
| Types: ADDED, DELETED; WatchingKeys: /lock/database/locks | 数据库锁状态变化监听器 | [`org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.database.watcher.DatabaseLockChangedWatcher`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/watcher/GlobalRuleChangedWatcher.java) |
-| Types: ADDED, UPDATED, DELETED; WatchingKeys: /metadata/${databaseName} | 元数据变化监听器 | [`org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.watcher.MetadataChangedWatcher`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java) |
+| Types: ADDED, UPDATED, DELETED; WatchingKeys: /metadata/${databaseName} | 元数据变化监听器 | [`org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.watcher.MetaDataChangedWatcher`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java) |
| Types: ADDED, UPDATED; WatchingKeys: /props | 属性变化监听器 | [`org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.watcher.PropertiesChangedWatcher`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/watcher/PropertiesChangedWatcher.java) |
| Types: ADDED, UPDATED, DELETED; WatchingKeys: /nodes/storage_nodes | 存储节点状态变化监听器 | [`org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.storage.watcher.StorageNodeStateChangedWatcher`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/storage/watcher/StorageNodeStateChangedWatcher.java) |
diff --git a/docs/document/content/dev-manual/mode.en.md b/docs/document/content/dev-manual/mode.en.md
index efef1febac8..597ef30a5f4 100644
--- a/docs/document/content/dev-manual/mode.en.md
+++ b/docs/document/content/dev-manual/mode.en.md
@@ -56,6 +56,6 @@ Governance listener definition
| ----------------------------------------------------------------------- | --------------------------------------------- | ---------------------------- |
| Types: ADDED, UPDATED, DELETED; WatchingKeys: /nodes/compute_nodes | Compute node state change listener | [`org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.watcher.ComputeNodeStateChangedWatcher`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/watcher/ComputeNodeStateChangedWatcher.java) |
| Types: UPDATED; WatchingKeys: /rules | The global rule configuration change listener | [`org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.watcher.GlobalRuleChangedWatcher`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/watcher/GlobalRuleChangedWatcher.java) |
-| Types: ADDED, UPDATED, DELETED; WatchingKeys: /metadata/${databaseName} | Metadata change listener | [`org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.watcher.MetadataChangedWatcher`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java) |
+| Types: ADDED, UPDATED, DELETED; WatchingKeys: /metadata/${databaseName} | Metadata change listener | [`org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.watcher.MetaDataChangedWatcher`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java) |
| Types: ADDED, UPDATED; WatchingKeys: /props | Property change listener | [`org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.watcher.PropertiesChangedWatcher`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/watcher/PropertiesChangedWatcher.java) |
| Types: ADDED, UPDATED, DELETED; WatchingKeys: /nodes/storage_nodes | Storage node state change listener | [`org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.storage.watcher.StorageNodeStateChangedWatcher`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/storage/watcher/StorageNodeStateChangedWatcher.java) |
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecutor.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecutor.java
index 4cfbcc82e43..261e01a07ab 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecutor.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecutor.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutor;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.raw.RawExecutor;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.sqlfederation.rule.SQLFederationRule;
import org.apache.shardingsphere.sqlfederation.spi.SQLFederationExecutor;
import org.apache.shardingsphere.traffic.executor.TrafficExecutor;
@@ -47,17 +47,17 @@ public final class DriverExecutor implements AutoCloseable {
private final TrafficExecutor trafficExecutor;
public DriverExecutor(final ShardingSphereConnection connection) {
- MetadataContexts metadataContexts = connection.getContextManager().getMetadataContexts();
+ MetaDataContexts metaDataContexts = connection.getContextManager().getMetaDataContexts();
ExecutorEngine executorEngine = connection.getContextManager().getExecutorEngine();
EventBusContext eventBusContext = connection.getContextManager().getInstanceContext().getEventBusContext();
JDBCExecutor jdbcExecutor = new JDBCExecutor(executorEngine, connection.getConnectionContext());
regularExecutor = new DriverJDBCExecutor(connection.getDatabaseName(), connection.getContextManager(), jdbcExecutor);
- rawExecutor = new RawExecutor(executorEngine, connection.getConnectionContext(), metadataContexts.getMetadata().getProps(), eventBusContext);
- DatabaseType protocolType = metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType();
+ rawExecutor = new RawExecutor(executorEngine, connection.getConnectionContext(), metaDataContexts.getMetaData().getProps(), eventBusContext);
+ DatabaseType protocolType = metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType();
String schemaName = DatabaseTypeEngine.getDefaultSchemaName(protocolType, connection.getDatabaseName());
- SQLFederationRule sqlFederationRule = metadataContexts.getMetadata().getGlobalRuleMetaData().getSingleRule(SQLFederationRule.class);
- federationExecutor = sqlFederationRule.getSQLFederationExecutor(connection.getDatabaseName(), schemaName, metadataContexts.getMetadata(),
- metadataContexts.getShardingSphereData(), jdbcExecutor, eventBusContext);
+ SQLFederationRule sqlFederationRule = metaDataContexts.getMetaData().getGlobalRuleMetaData().getSingleRule(SQLFederationRule.class);
+ federationExecutor = sqlFederationRule.getSQLFederationExecutor(connection.getDatabaseName(), schemaName, metaDataContexts.getMetaData(),
+ metaDataContexts.getShardingSphereData(), jdbcExecutor, eventBusContext);
trafficExecutor = new TrafficExecutor();
}
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
index e675719941c..bd595960d98 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
@@ -33,7 +33,7 @@ import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.rule.identifier.type.DataNodeContainedRule;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import java.sql.SQLException;
import java.util.Collection;
@@ -47,7 +47,7 @@ public final class DriverJDBCExecutor {
private final String databaseName;
- private final MetadataContexts metadataContexts;
+ private final MetaDataContexts metaDataContexts;
private final ContextManager contextManager;
@@ -61,9 +61,9 @@ public final class DriverJDBCExecutor {
this.databaseName = databaseName;
this.contextManager = contextManager;
this.jdbcExecutor = jdbcExecutor;
- metadataContexts = contextManager.getMetadataContexts();
+ metaDataContexts = contextManager.getMetaDataContexts();
eventBusContext = contextManager.getInstanceContext().getEventBusContext();
- metadataRefreshEngine = new MetaDataRefreshEngine(metadataContexts.getMetadata().getDatabase(databaseName), metadataContexts.getMetadata().getProps());
+ metadataRefreshEngine = new MetaDataRefreshEngine(metaDataContexts.getMetaData().getDatabase(databaseName), metaDataContexts.getMetaData().getProps());
}
/**
@@ -103,7 +103,7 @@ public final class DriverJDBCExecutor {
ExecuteProcessEngine.initializeExecution(queryContext, executionGroupContext, eventBusContext);
SQLStatementContext<?> sqlStatementContext = queryContext.getSqlStatementContext();
List<Integer> results = doExecute(executionGroupContext, sqlStatementContext, routeUnits, callback);
- int result = isNeedAccumulate(metadataContexts.getMetadata().getDatabase(databaseName).getRuleMetaData().getRules(), sqlStatementContext) ? accumulate(results) : results.get(0);
+ int result = isNeedAccumulate(metaDataContexts.getMetaData().getDatabase(databaseName).getRuleMetaData().getRules(), sqlStatementContext) ? accumulate(results) : results.get(0);
ExecuteProcessEngine.finishExecution(executionGroupContext.getExecutionID(), eventBusContext);
return result;
} finally {
@@ -154,11 +154,11 @@ public final class DriverJDBCExecutor {
private <T> List<T> doExecute(final ExecutionGroupContext<JDBCExecutionUnit> executionGroupContext, final SQLStatementContext<?> sqlStatementContext, final Collection<RouteUnit> routeUnits,
final JDBCExecutorCallback<T> callback) throws SQLException {
List<T> results = jdbcExecutor.execute(executionGroupContext, callback);
- refreshMetadata(sqlStatementContext, routeUnits);
+ refreshMetaData(sqlStatementContext, routeUnits);
return results;
}
- private void refreshMetadata(final SQLStatementContext<?> sqlStatementContext, final Collection<RouteUnit> routeUnits) throws SQLException {
+ private void refreshMetaData(final SQLStatementContext<?> sqlStatementContext, final Collection<RouteUnit> routeUnits) throws SQLException {
Optional<MetaDataRefreshedEvent> event = metadataRefreshEngine.refresh(sqlStatementContext, routeUnits);
if (contextManager.getInstanceContext().isCluster() && event.isPresent()) {
eventBusContext.post(event.get());
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutor.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutor.java
index e0ce70f4bd9..19cb5608f37 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutor.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutor.java
@@ -31,7 +31,7 @@ import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.J
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutorCallback;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.rule.identifier.type.DataNodeContainedRule;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import java.sql.SQLException;
@@ -50,7 +50,7 @@ import java.util.Optional;
*/
public final class BatchPreparedStatementExecutor {
- private final MetadataContexts metadataContexts;
+ private final MetaDataContexts metaDataContexts;
private final JDBCExecutor jdbcExecutor;
@@ -65,9 +65,9 @@ public final class BatchPreparedStatementExecutor {
private final EventBusContext eventBusContext;
- public BatchPreparedStatementExecutor(final MetadataContexts metadataContexts, final JDBCExecutor jdbcExecutor, final String databaseName, final EventBusContext eventBusContext) {
+ public BatchPreparedStatementExecutor(final MetaDataContexts metaDataContexts, final JDBCExecutor jdbcExecutor, final String databaseName, final EventBusContext eventBusContext) {
this.databaseName = databaseName;
- this.metadataContexts = metadataContexts;
+ this.metaDataContexts = metaDataContexts;
this.jdbcExecutor = jdbcExecutor;
this.eventBusContext = eventBusContext;
executionGroupContext = new ExecutionGroupContext<>(new LinkedList<>());
@@ -138,8 +138,8 @@ public final class BatchPreparedStatementExecutor {
*/
public int[] executeBatch(final SQLStatementContext<?> sqlStatementContext) throws SQLException {
boolean isExceptionThrown = SQLExecutorExceptionHandler.isExceptionThrown();
- JDBCExecutorCallback<int[]> callback = new JDBCExecutorCallback<int[]>(metadataContexts.getMetadata().getDatabase(databaseName).getProtocolType(),
- metadataContexts.getMetadata().getDatabase(databaseName).getResourceMetaData().getStorageTypes(), sqlStatementContext.getSqlStatement(), isExceptionThrown, eventBusContext) {
+ JDBCExecutorCallback<int[]> callback = new JDBCExecutorCallback<int[]>(metaDataContexts.getMetaData().getDatabase(databaseName).getProtocolType(),
+ metaDataContexts.getMetaData().getDatabase(databaseName).getResourceMetaData().getStorageTypes(), sqlStatementContext.getSqlStatement(), isExceptionThrown, eventBusContext) {
@Override
protected int[] executeSQL(final String sql, final Statement statement, final ConnectionMode connectionMode, final DatabaseType storageType) throws SQLException {
@@ -160,7 +160,7 @@ public final class BatchPreparedStatementExecutor {
}
private boolean isNeedAccumulate(final SQLStatementContext<?> sqlStatementContext) {
- for (ShardingSphereRule each : metadataContexts.getMetadata().getDatabase(databaseName).getRuleMetaData().getRules()) {
+ for (ShardingSphereRule each : metaDataContexts.getMetaData().getDatabase(databaseName).getRuleMetaData().getRules()) {
if (each instanceof DataNodeContainedRule && ((DataNodeContainedRule) each).isNeedAccumulate(sqlStatementContext.getTablesContext().getTableNames())) {
return true;
}
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractResultSetAdapter.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractResultSetAdapter.java
index 35001eceb31..e4002e8363b 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractResultSetAdapter.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractResultSetAdapter.java
@@ -69,7 +69,7 @@ public abstract class AbstractResultSetAdapter extends AbstractUnsupportedOperat
ShardingSphereConnection connection = statement instanceof ShardingSpherePreparedStatement
? ((ShardingSpherePreparedStatement) statement).getConnection()
: ((ShardingSphereStatement) statement).getConnection();
- return connection.getContextManager().getMetadataContexts().getMetadata().getDatabase(connection.getDatabaseName());
+ return connection.getContextManager().getMetaDataContexts().getMetaData().getDatabase(connection.getDatabaseName());
}
@Override
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractStatementAdapter.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractStatementAdapter.java
index 34a5dfaaf52..b81ddaece2b 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractStatementAdapter.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractStatementAdapter.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.driver.jdbc.unsupported.AbstractUnsupportedOper
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.database.type.dialect.OpenGaussDatabaseType;
import org.apache.shardingsphere.infra.database.type.dialect.PostgreSQLDatabaseType;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import java.sql.SQLException;
import java.sql.SQLWarning;
@@ -193,9 +193,9 @@ public abstract class AbstractStatementAdapter extends AbstractUnsupportedOperat
}
}
- protected final void handleExceptionInTransaction(final ShardingSphereConnection connection, final MetadataContexts metadataContexts) {
+ protected final void handleExceptionInTransaction(final ShardingSphereConnection connection, final MetaDataContexts metaDataContexts) {
if (connection.getConnectionManager().getConnectionTransaction().isInTransaction()) {
- DatabaseType databaseType = metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType();
+ DatabaseType databaseType = metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType();
if (databaseType instanceof PostgreSQLDatabaseType || databaseType instanceof OpenGaussDatabaseType) {
connection.getConnectionManager().getConnectionTransaction().setRollbackOnly(true);
}
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManager.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManager.java
index ba6b8bd5ee0..51b1815d731 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManager.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManager.java
@@ -35,7 +35,7 @@ import org.apache.shardingsphere.infra.instance.metadata.InstanceType;
import org.apache.shardingsphere.infra.instance.metadata.proxy.ProxyInstanceMetaData;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.traffic.rule.TrafficRule;
import org.apache.shardingsphere.transaction.ConnectionSavepointManager;
import org.apache.shardingsphere.transaction.ConnectionTransaction;
@@ -85,12 +85,12 @@ public final class ConnectionManager implements ExecutorJDBCConnectionManager, A
}
private Map<String, DataSource> getTrafficDataSourceMap(final String databaseName, final ContextManager contextManager) {
- TrafficRule trafficRule = contextManager.getMetadataContexts().getMetadata().getGlobalRuleMetaData().getSingleRule(TrafficRule.class);
- MetadataPersistService persistService = contextManager.getMetadataContexts().getPersistService();
+ TrafficRule trafficRule = contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(TrafficRule.class);
+ MetaDataPersistService persistService = contextManager.getMetaDataContexts().getPersistService();
if (trafficRule.getStrategyRules().isEmpty()) {
return Collections.emptyMap();
}
- String actualDatabaseName = contextManager.getMetadataContexts().getMetadata().getActualDatabaseName(databaseName);
+ String actualDatabaseName = contextManager.getMetaDataContexts().getMetaData().getActualDatabaseName(databaseName);
Map<String, DataSourceProperties> dataSourcePropsMap = persistService.getDataSourceService().load(actualDatabaseName);
Preconditions.checkState(!dataSourcePropsMap.isEmpty(), "Can not get data source properties from meta data.");
DataSourceProperties dataSourcePropsSample = dataSourcePropsMap.values().iterator().next();
@@ -127,7 +127,7 @@ public final class ConnectionManager implements ExecutorJDBCConnectionManager, A
private ConnectionTransaction createConnectionTransaction(final String databaseName, final ContextManager contextManager) {
TransactionType type = TransactionTypeHolder.get();
- TransactionRule transactionRule = contextManager.getMetadataContexts().getMetadata().getGlobalRuleMetaData().getSingleRule(TransactionRule.class);
+ TransactionRule transactionRule = contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(TransactionRule.class);
return null == type ? new ConnectionTransaction(databaseName, transactionRule) : new ConnectionTransaction(databaseName, type, transactionRule);
}
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaData.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaData.java
index 4cc83be8f47..f305ba87876 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaData.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaData.java
@@ -51,7 +51,7 @@ public final class ShardingSphereDatabaseMetaData extends AdaptedDatabaseMetaDat
public ShardingSphereDatabaseMetaData(final ShardingSphereConnection connection) {
super(connection.getJdbcContext().getCachedDatabaseMetaData());
this.connection = connection;
- rules = connection.getContextManager().getMetadataContexts().getMetadata().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules();
+ rules = connection.getContextManager().getMetaDataContexts().getMetaData().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules();
}
@Override
@@ -223,13 +223,13 @@ public final class ShardingSphereDatabaseMetaData extends AdaptedDatabaseMetaDat
private String getActualCatalog(final String catalog) {
DataSourceMetaData metaData = connection.getContextManager()
- .getMetadataContexts().getMetadata().getDatabase(connection.getDatabaseName()).getResourceMetaData().getDataSourceMetaData(getDataSourceName());
+ .getMetaDataContexts().getMetaData().getDatabase(connection.getDatabaseName()).getResourceMetaData().getDataSourceMetaData(getDataSourceName());
return null != catalog && catalog.contains(DefaultDatabase.LOGIC_NAME) ? metaData.getCatalog() : catalog;
}
private String getActualSchema(final String schema) {
DataSourceMetaData metaData = connection.getContextManager()
- .getMetadataContexts().getMetadata().getDatabase(connection.getDatabaseName()).getResourceMetaData().getDataSourceMetaData(getDataSourceName());
+ .getMetaDataContexts().getMetaData().getDatabase(connection.getDatabaseName()).getResourceMetaData().getDataSourceMetaData(getDataSourceName());
return null != schema && schema.contains(DefaultDatabase.LOGIC_NAME) ? metaData.getSchema() : schema;
}
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
index 824b1b9f973..70b25ed07ae 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
@@ -80,7 +80,7 @@ import org.apache.shardingsphere.infra.rule.identifier.type.DataNodeContainedRul
import org.apache.shardingsphere.infra.rule.identifier.type.RawExecutionRule;
import org.apache.shardingsphere.infra.rule.identifier.type.StorageConnectorReusableRule;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dal.DALStatement;
@@ -116,7 +116,7 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
@Getter
private final ShardingSphereConnection connection;
- private final MetadataContexts metadataContexts;
+ private final MetaDataContexts metaDataContexts;
private final String sql;
@@ -189,24 +189,24 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
throw new EmptySQLException().toSQLException();
}
this.connection = connection;
- metadataContexts = connection.getContextManager().getMetadataContexts();
+ metaDataContexts = connection.getContextManager().getMetaDataContexts();
eventBusContext = connection.getContextManager().getInstanceContext().getEventBusContext();
this.sql = sql;
statements = new ArrayList<>();
parameterSets = new ArrayList<>();
- SQLParserRule sqlParserRule = metadataContexts.getMetadata().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
+ SQLParserRule sqlParserRule = metaDataContexts.getMetaData().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
ShardingSphereSQLParserEngine sqlParserEngine = sqlParserRule.getSQLParserEngine(
- DatabaseTypeEngine.getTrunkDatabaseTypeName(metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType()));
+ DatabaseTypeEngine.getTrunkDatabaseTypeName(metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType()));
sqlStatement = sqlParserEngine.parse(sql, true);
- sqlStatementContext = SQLStatementContextFactory.newInstance(metadataContexts.getMetadata(), sqlStatement, connection.getDatabaseName());
+ sqlStatementContext = SQLStatementContextFactory.newInstance(metaDataContexts.getMetaData(), sqlStatement, connection.getDatabaseName());
parameterMetaData = new ShardingSphereParameterMetaData(sqlStatement);
statementOption = returnGeneratedKeys ? new StatementOption(true, columns) : new StatementOption(resultSetType, resultSetConcurrency, resultSetHoldability);
executor = new DriverExecutor(connection);
JDBCExecutor jdbcExecutor = new JDBCExecutor(connection.getContextManager().getExecutorEngine(), connection.getConnectionContext());
- batchPreparedStatementExecutor = new BatchPreparedStatementExecutor(metadataContexts, jdbcExecutor, connection.getDatabaseName(), eventBusContext);
+ batchPreparedStatementExecutor = new BatchPreparedStatementExecutor(metaDataContexts, jdbcExecutor, connection.getDatabaseName(), eventBusContext);
kernelProcessor = new KernelProcessor();
- statementsCacheable = isStatementsCacheable(metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getRuleMetaData());
- trafficRule = metadataContexts.getMetadata().getGlobalRuleMetaData().getSingleRule(TrafficRule.class);
+ statementsCacheable = isStatementsCacheable(metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getRuleMetaData());
+ trafficRule = metaDataContexts.getMetaData().getGlobalRuleMetaData().getSingleRule(TrafficRule.class);
statementManager = new StatementManager();
}
@@ -229,7 +229,7 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
JDBCExecutionUnit executionUnit = createTrafficExecutionUnit(trafficInstanceId, queryContext);
return executor.getTrafficExecutor().execute(executionUnit, (statement, sql) -> ((PreparedStatement) statement).executeQuery());
}
- deciderContext = decide(queryContext, metadataContexts.getMetadata().getProps(), metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()));
+ deciderContext = decide(queryContext, metaDataContexts.getMetaData().getProps(), metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()));
if (deciderContext.isUseSQLFederation()) {
return executeFederationQuery(queryContext);
}
@@ -243,8 +243,8 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- handleExceptionInTransaction(connection, metadataContexts);
- throw SQLExceptionTransformEngine.toSQLException(ex, metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
+ handleExceptionInTransaction(connection, metaDataContexts);
+ throw SQLExceptionTransformEngine.toSQLException(ex, metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
} finally {
clearBatch();
}
@@ -299,24 +299,24 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
ExecutionGroupContext<JDBCExecutionUnit> executionGroupContext = createExecutionGroupContext();
cacheStatements(executionGroupContext.getInputGroups());
return executor.getRegularExecutor().executeQuery(executionGroupContext, executionContext.getQueryContext(),
- new PreparedStatementExecuteQueryCallback(metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType(),
- metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getResourceMetaData().getStorageTypes(), sqlStatement, SQLExecutorExceptionHandler.isExceptionThrown(),
+ new PreparedStatementExecuteQueryCallback(metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType(),
+ metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getResourceMetaData().getStorageTypes(), sqlStatement, SQLExecutorExceptionHandler.isExceptionThrown(),
eventBusContext));
}
private ResultSet executeFederationQuery(final QueryContext queryContext) throws SQLException {
- PreparedStatementExecuteQueryCallback callback = new PreparedStatementExecuteQueryCallback(metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType(),
- metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getResourceMetaData().getStorageTypes(), sqlStatement, SQLExecutorExceptionHandler.isExceptionThrown(),
+ PreparedStatementExecuteQueryCallback callback = new PreparedStatementExecuteQueryCallback(metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType(),
+ metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getResourceMetaData().getStorageTypes(), sqlStatement, SQLExecutorExceptionHandler.isExceptionThrown(),
eventBusContext);
- SQLFederationExecutorContext context = new SQLFederationExecutorContext(false, queryContext, metadataContexts.getMetadata());
+ SQLFederationExecutorContext context = new SQLFederationExecutorContext(false, queryContext, metaDataContexts.getMetaData());
return executor.getFederationExecutor().executeQuery(createDriverExecutionPrepareEngine(), callback, context);
}
private DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> createDriverExecutionPrepareEngine() {
- int maxConnectionsSizePerQuery = metadataContexts.getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY);
+ int maxConnectionsSizePerQuery = metaDataContexts.getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY);
return new DriverExecutionPrepareEngine<>(JDBCDriverType.PREPARED_STATEMENT, maxConnectionsSizePerQuery, connection.getConnectionManager(), statementManager,
- statementOption, metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules(),
- metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getResourceMetaData().getStorageTypes());
+ statementOption, metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules(),
+ metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getResourceMetaData().getStorageTypes());
}
@Override
@@ -343,8 +343,8 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- handleExceptionInTransaction(connection, metadataContexts);
- throw SQLExceptionTransformEngine.toSQLException(ex, metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
+ handleExceptionInTransaction(connection, metaDataContexts);
+ throw SQLExceptionTransformEngine.toSQLException(ex, metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
} finally {
clearBatch();
}
@@ -367,8 +367,8 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
private JDBCExecutorCallback<Integer> createExecuteUpdateCallback() {
boolean isExceptionThrown = SQLExecutorExceptionHandler.isExceptionThrown();
- return new JDBCExecutorCallback<Integer>(metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType(),
- metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getResourceMetaData().getStorageTypes(), sqlStatement, isExceptionThrown,
+ return new JDBCExecutorCallback<Integer>(metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType(),
+ metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getResourceMetaData().getStorageTypes(), sqlStatement, isExceptionThrown,
eventBusContext) {
@Override
@@ -397,7 +397,7 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
JDBCExecutionUnit executionUnit = createTrafficExecutionUnit(trafficInstanceId, queryContext);
return executor.getTrafficExecutor().execute(executionUnit, (statement, sql) -> ((PreparedStatement) statement).execute());
}
- deciderContext = decide(queryContext, metadataContexts.getMetadata().getProps(), metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()));
+ deciderContext = decide(queryContext, metaDataContexts.getMetaData().getProps(), metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()));
if (deciderContext.isUseSQLFederation()) {
ResultSet resultSet = executeFederationQuery(queryContext);
return null != resultSet;
@@ -413,15 +413,15 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- handleExceptionInTransaction(connection, metadataContexts);
- throw SQLExceptionTransformEngine.toSQLException(ex, metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
+ handleExceptionInTransaction(connection, metaDataContexts);
+ throw SQLExceptionTransformEngine.toSQLException(ex, metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
} finally {
clearBatch();
}
}
private boolean hasRawExecutionRule() {
- for (ShardingSphereRule each : metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules()) {
+ for (ShardingSphereRule each : metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules()) {
if (each instanceof RawExecutionRule) {
return true;
}
@@ -430,8 +430,8 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
}
private ExecutionGroupContext<RawSQLExecutionUnit> createRawExecutionGroupContext() throws SQLException {
- int maxConnectionsSizePerQuery = metadataContexts.getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY);
- return new RawExecutionPrepareEngine(maxConnectionsSizePerQuery, metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules())
+ int maxConnectionsSizePerQuery = metaDataContexts.getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY);
+ return new RawExecutionPrepareEngine(maxConnectionsSizePerQuery, metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules())
.prepare(executionContext.getRouteContext(), executionContext.getExecutionUnits());
}
@@ -453,7 +453,7 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
} catch (final Exception ex) {
// CHECKSTYLE:ON
connection.rollback();
- throw SQLExceptionTransformEngine.toSQLException(ex, metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
+ throw SQLExceptionTransformEngine.toSQLException(ex, metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
}
return result;
}
@@ -468,7 +468,7 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
} catch (final Exception ex) {
// CHECKSTYLE:ON
connection.rollback();
- throw SQLExceptionTransformEngine.toSQLException(ex, metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
+ throw SQLExceptionTransformEngine.toSQLException(ex, metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
}
return result;
}
@@ -482,8 +482,8 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
private JDBCExecutorCallback<Boolean> createExecuteCallback() {
boolean isExceptionThrown = SQLExecutorExceptionHandler.isExceptionThrown();
- return new JDBCExecutorCallback<Boolean>(metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType(),
- metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getResourceMetaData().getStorageTypes(), sqlStatement, isExceptionThrown,
+ return new JDBCExecutorCallback<Boolean>(metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType(),
+ metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getResourceMetaData().getStorageTypes(), sqlStatement, isExceptionThrown,
eventBusContext) {
@Override
@@ -544,10 +544,10 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
private ExecutionContext createExecutionContext(final QueryContext queryContext) {
SQLCheckEngine.check(queryContext.getSqlStatementContext(), queryContext.getParameters(),
- metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules(),
- connection.getDatabaseName(), metadataContexts.getMetadata().getDatabases(), null);
- ExecutionContext result = kernelProcessor.generateExecutionContext(queryContext, metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()),
- metadataContexts.getMetadata().getGlobalRuleMetaData(), metadataContexts.getMetadata().getProps(), connection.getConnectionContext());
+ metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules(),
+ connection.getDatabaseName(), metaDataContexts.getMetaData().getDatabases(), null);
+ ExecutionContext result = kernelProcessor.generateExecutionContext(queryContext, metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()),
+ metaDataContexts.getMetaData().getGlobalRuleMetaData(), metaDataContexts.getMetaData().getProps(), connection.getConnectionContext());
findGeneratedKey(result).ifPresent(generatedKey -> generatedValues.addAll(generatedKey.getGeneratedValues()));
return result;
}
@@ -566,8 +566,8 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
}
private MergedResult mergeQuery(final List<QueryResult> queryResults) throws SQLException {
- MergeEngine mergeEngine = new MergeEngine(metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()),
- metadataContexts.getMetadata().getProps(), connection.getConnectionContext());
+ MergeEngine mergeEngine = new MergeEngine(metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()),
+ metaDataContexts.getMetaData().getProps(), connection.getConnectionContext());
return mergeEngine.merge(queryResults, executionContext.getSqlStatementContext());
}
@@ -647,19 +647,19 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- handleExceptionInTransaction(connection, metadataContexts);
- throw SQLExceptionTransformEngine.toSQLException(ex, metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
+ handleExceptionInTransaction(connection, metaDataContexts);
+ throw SQLExceptionTransformEngine.toSQLException(ex, metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
} finally {
clearBatch();
}
}
private void initBatchPreparedStatementExecutor() throws SQLException {
- DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine = new DriverExecutionPrepareEngine<>(JDBCDriverType.PREPARED_STATEMENT, metadataContexts.getMetadata().getProps()
+ DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine = new DriverExecutionPrepareEngine<>(JDBCDriverType.PREPARED_STATEMENT, metaDataContexts.getMetaData().getProps()
.<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY), connection.getConnectionManager(), statementManager, statementOption,
- metadataContexts.getMetadata()
+ metaDataContexts.getMetaData()
.getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules(),
- metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getResourceMetaData().getStorageTypes());
+ metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getResourceMetaData().getStorageTypes());
List<ExecutionUnit> executionUnits = new ArrayList<>(batchPreparedStatementExecutor.getBatchExecutionUnits().size());
for (BatchExecutionUnit each : batchPreparedStatementExecutor.getBatchExecutionUnits()) {
ExecutionUnit executionUnit = each.getExecutionUnit();
@@ -705,7 +705,7 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
@Override
public boolean isAccumulate() {
- return metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules().stream()
+ return metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules().stream()
.anyMatch(each -> each instanceof DataNodeContainedRule && ((DataNodeContainedRule) each)
.isNeedAccumulate(executionContext.getSqlStatementContext().getTablesContext().getTableNames()));
}
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
index a90c43ba5f3..2d80e864700 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
@@ -73,7 +73,7 @@ import org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.infra.rule.identifier.type.DataNodeContainedRule;
import org.apache.shardingsphere.infra.rule.identifier.type.RawExecutionRule;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dal.DALStatement;
@@ -106,7 +106,7 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
@Getter
private final ShardingSphereConnection connection;
- private final MetadataContexts metadataContexts;
+ private final MetaDataContexts metaDataContexts;
private final List<Statement> statements;
@@ -144,13 +144,13 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
public ShardingSphereStatement(final ShardingSphereConnection connection, final int resultSetType, final int resultSetConcurrency, final int resultSetHoldability) {
this.connection = connection;
- metadataContexts = connection.getContextManager().getMetadataContexts();
+ metaDataContexts = connection.getContextManager().getMetaDataContexts();
eventBusContext = connection.getContextManager().getInstanceContext().getEventBusContext();
statements = new LinkedList<>();
statementOption = new StatementOption(resultSetType, resultSetConcurrency, resultSetHoldability);
executor = new DriverExecutor(connection);
kernelProcessor = new KernelProcessor();
- trafficRule = metadataContexts.getMetadata().getGlobalRuleMetaData().getSingleRule(TrafficRule.class);
+ trafficRule = metaDataContexts.getMetaData().getGlobalRuleMetaData().getSingleRule(TrafficRule.class);
statementManager = new StatementManager();
}
@@ -168,7 +168,7 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
JDBCExecutionUnit executionUnit = createTrafficExecutionUnit(trafficInstanceId, queryContext);
return executor.getTrafficExecutor().execute(executionUnit, Statement::executeQuery);
}
- deciderContext = decide(queryContext, metadataContexts.getMetadata().getProps(), metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()));
+ deciderContext = decide(queryContext, metaDataContexts.getMetaData().getProps(), metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()));
if (deciderContext.isUseSQLFederation()) {
return executeFederationQuery(queryContext);
}
@@ -179,8 +179,8 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- handleExceptionInTransaction(connection, metadataContexts);
- throw SQLExceptionTransformEngine.toSQLException(ex, metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
+ handleExceptionInTransaction(connection, metaDataContexts);
+ throw SQLExceptionTransformEngine.toSQLException(ex, metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
} finally {
currentResultSet = null;
}
@@ -212,31 +212,31 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
}
private List<QueryResult> executeQuery0() throws SQLException {
- if (metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules().stream().anyMatch(each -> each instanceof RawExecutionRule)) {
+ if (metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules().stream().anyMatch(each -> each instanceof RawExecutionRule)) {
return executor.getRawExecutor().execute(createRawExecutionContext(), executionContext.getQueryContext(),
new RawSQLExecutorCallback(eventBusContext)).stream().map(each -> (QueryResult) each).collect(Collectors.toList());
}
ExecutionGroupContext<JDBCExecutionUnit> executionGroupContext = createExecutionGroupContext();
cacheStatements(executionGroupContext.getInputGroups());
- StatementExecuteQueryCallback callback = new StatementExecuteQueryCallback(metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType(),
- metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getResourceMetaData().getStorageTypes(), executionContext.getSqlStatementContext().getSqlStatement(),
+ StatementExecuteQueryCallback callback = new StatementExecuteQueryCallback(metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType(),
+ metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getResourceMetaData().getStorageTypes(), executionContext.getSqlStatementContext().getSqlStatement(),
SQLExecutorExceptionHandler.isExceptionThrown(), eventBusContext);
return executor.getRegularExecutor().executeQuery(executionGroupContext, executionContext.getQueryContext(), callback);
}
private ResultSet executeFederationQuery(final QueryContext queryContext) throws SQLException {
- StatementExecuteQueryCallback callback = new StatementExecuteQueryCallback(metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType(),
- metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getResourceMetaData().getStorageTypes(), queryContext.getSqlStatementContext().getSqlStatement(),
+ StatementExecuteQueryCallback callback = new StatementExecuteQueryCallback(metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType(),
+ metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getResourceMetaData().getStorageTypes(), queryContext.getSqlStatementContext().getSqlStatement(),
SQLExecutorExceptionHandler.isExceptionThrown(), eventBusContext);
- SQLFederationExecutorContext context = new SQLFederationExecutorContext(false, queryContext, metadataContexts.getMetadata());
+ SQLFederationExecutorContext context = new SQLFederationExecutorContext(false, queryContext, metaDataContexts.getMetaData());
return executor.getFederationExecutor().executeQuery(createDriverExecutionPrepareEngine(), callback, context);
}
private DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> createDriverExecutionPrepareEngine() {
- int maxConnectionsSizePerQuery = metadataContexts.getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY);
+ int maxConnectionsSizePerQuery = metaDataContexts.getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY);
return new DriverExecutionPrepareEngine<>(JDBCDriverType.STATEMENT, maxConnectionsSizePerQuery, connection.getConnectionManager(), statementManager, statementOption,
- metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules(),
- metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getResourceMetaData().getStorageTypes());
+ metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules(),
+ metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getResourceMetaData().getStorageTypes());
}
@Override
@@ -250,15 +250,15 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
return executor.getTrafficExecutor().execute(executionUnit, Statement::executeUpdate);
}
executionContext = createExecutionContext(queryContext);
- if (metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules().stream().anyMatch(each -> each instanceof RawExecutionRule)) {
+ if (metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules().stream().anyMatch(each -> each instanceof RawExecutionRule)) {
return accumulate(executor.getRawExecutor().execute(createRawExecutionContext(), executionContext.getQueryContext(), new RawSQLExecutorCallback(eventBusContext)));
}
return executeUpdate((actualSQL, statement) -> statement.executeUpdate(actualSQL), executionContext.getSqlStatementContext());
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- handleExceptionInTransaction(connection, metadataContexts);
- throw SQLExceptionTransformEngine.toSQLException(ex, metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
+ handleExceptionInTransaction(connection, metaDataContexts);
+ throw SQLExceptionTransformEngine.toSQLException(ex, metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
} finally {
currentResultSet = null;
}
@@ -278,15 +278,15 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
return executor.getTrafficExecutor().execute(executionUnit, (statement, actualSQL) -> statement.executeUpdate(actualSQL, autoGeneratedKeys));
}
executionContext = createExecutionContext(queryContext);
- if (metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules().stream().anyMatch(each -> each instanceof RawExecutionRule)) {
+ if (metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules().stream().anyMatch(each -> each instanceof RawExecutionRule)) {
return accumulate(executor.getRawExecutor().execute(createRawExecutionContext(), executionContext.getQueryContext(), new RawSQLExecutorCallback(eventBusContext)));
}
return executeUpdate((actualSQL, statement) -> statement.executeUpdate(actualSQL, autoGeneratedKeys), executionContext.getSqlStatementContext());
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- handleExceptionInTransaction(connection, metadataContexts);
- throw SQLExceptionTransformEngine.toSQLException(ex, metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
+ handleExceptionInTransaction(connection, metaDataContexts);
+ throw SQLExceptionTransformEngine.toSQLException(ex, metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
} finally {
currentResultSet = null;
}
@@ -304,15 +304,15 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
return executor.getTrafficExecutor().execute(executionUnit, (statement, actualSQL) -> statement.executeUpdate(actualSQL, columnIndexes));
}
executionContext = createExecutionContext(queryContext);
- if (metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules().stream().anyMatch(each -> each instanceof RawExecutionRule)) {
+ if (metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules().stream().anyMatch(each -> each instanceof RawExecutionRule)) {
return accumulate(executor.getRawExecutor().execute(createRawExecutionContext(), executionContext.getQueryContext(), new RawSQLExecutorCallback(eventBusContext)));
}
return executeUpdate((actualSQL, statement) -> statement.executeUpdate(actualSQL, columnIndexes), executionContext.getSqlStatementContext());
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- handleExceptionInTransaction(connection, metadataContexts);
- throw SQLExceptionTransformEngine.toSQLException(ex, metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
+ handleExceptionInTransaction(connection, metaDataContexts);
+ throw SQLExceptionTransformEngine.toSQLException(ex, metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
} finally {
currentResultSet = null;
}
@@ -330,15 +330,15 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
return executor.getTrafficExecutor().execute(executionUnit, (statement, actualSQL) -> statement.executeUpdate(actualSQL, columnNames));
}
executionContext = createExecutionContext(queryContext);
- if (metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules().stream().anyMatch(each -> each instanceof RawExecutionRule)) {
+ if (metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules().stream().anyMatch(each -> each instanceof RawExecutionRule)) {
return accumulate(executor.getRawExecutor().execute(createRawExecutionContext(), executionContext.getQueryContext(), new RawSQLExecutorCallback(eventBusContext)));
}
return executeUpdate((actualSQL, statement) -> statement.executeUpdate(actualSQL, columnNames), executionContext.getSqlStatementContext());
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- handleExceptionInTransaction(connection, metadataContexts);
- throw SQLExceptionTransformEngine.toSQLException(ex, metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
+ handleExceptionInTransaction(connection, metaDataContexts);
+ throw SQLExceptionTransformEngine.toSQLException(ex, metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
} finally {
currentResultSet = null;
}
@@ -358,7 +358,7 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
} catch (final Exception ex) {
// CHECKSTYLE:ON
connection.rollback();
- throw SQLExceptionTransformEngine.toSQLException(ex, metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
+ throw SQLExceptionTransformEngine.toSQLException(ex, metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
}
return result;
}
@@ -373,8 +373,8 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
private JDBCExecutorCallback<Integer> createExecuteUpdateCallback(final ExecuteUpdateCallback updater, final SQLStatementContext<?> sqlStatementContext) {
boolean isExceptionThrown = SQLExecutorExceptionHandler.isExceptionThrown();
- return new JDBCExecutorCallback<Integer>(metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType(),
- metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getResourceMetaData().getStorageTypes(), sqlStatementContext.getSqlStatement(), isExceptionThrown,
+ return new JDBCExecutorCallback<Integer>(metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType(),
+ metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getResourceMetaData().getStorageTypes(), sqlStatementContext.getSqlStatement(), isExceptionThrown,
eventBusContext) {
@Override
@@ -404,8 +404,8 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
// CHECKSTYLE:OFF
} catch (final SQLException ex) {
// CHECKSTYLE:ON
- handleExceptionInTransaction(connection, metadataContexts);
- throw SQLExceptionTransformEngine.toSQLException(ex, metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
+ handleExceptionInTransaction(connection, metaDataContexts);
+ throw SQLExceptionTransformEngine.toSQLException(ex, metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
}
}
@@ -419,8 +419,8 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
// CHECKSTYLE:OFF
} catch (final SQLException ex) {
// CHECKSTYLE:ON
- handleExceptionInTransaction(connection, metadataContexts);
- throw SQLExceptionTransformEngine.toSQLException(ex, metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
+ handleExceptionInTransaction(connection, metaDataContexts);
+ throw SQLExceptionTransformEngine.toSQLException(ex, metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
}
}
@@ -432,8 +432,8 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
// CHECKSTYLE:OFF
} catch (final SQLException ex) {
// CHECKSTYLE:ON
- handleExceptionInTransaction(connection, metadataContexts);
- throw SQLExceptionTransformEngine.toSQLException(ex, metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
+ handleExceptionInTransaction(connection, metaDataContexts);
+ throw SQLExceptionTransformEngine.toSQLException(ex, metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
}
}
@@ -445,8 +445,8 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
// CHECKSTYLE:OFF
} catch (final SQLException ex) {
// CHECKSTYLE:ON
- handleExceptionInTransaction(connection, metadataContexts);
- throw SQLExceptionTransformEngine.toSQLException(ex, metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
+ handleExceptionInTransaction(connection, metaDataContexts);
+ throw SQLExceptionTransformEngine.toSQLException(ex, metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
}
}
@@ -459,13 +459,13 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
JDBCExecutionUnit executionUnit = createTrafficExecutionUnit(trafficInstanceId, queryContext);
return executor.getTrafficExecutor().execute(executionUnit, (statement, actualSQL) -> callback.execute(actualSQL, statement));
}
- deciderContext = decide(queryContext, metadataContexts.getMetadata().getProps(), metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()));
+ deciderContext = decide(queryContext, metaDataContexts.getMetaData().getProps(), metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()));
if (deciderContext.isUseSQLFederation()) {
ResultSet resultSet = executeFederationQuery(queryContext);
return null != resultSet;
}
executionContext = createExecutionContext(queryContext);
- if (metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules().stream().anyMatch(each -> each instanceof RawExecutionRule)) {
+ if (metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules().stream().anyMatch(each -> each instanceof RawExecutionRule)) {
// TODO process getStatement
Collection<ExecuteResult> results = executor.getRawExecutor().execute(createRawExecutionContext(), executionContext.getQueryContext(), new RawSQLExecutorCallback(eventBusContext));
return results.iterator().next() instanceof QueryResult;
@@ -504,20 +504,20 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
}
private QueryContext createQueryContext(final String sql) {
- SQLParserRule sqlParserRule = metadataContexts.getMetadata().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
+ SQLParserRule sqlParserRule = metaDataContexts.getMetaData().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
SQLStatement sqlStatement = sqlParserRule.getSQLParserEngine(
- DatabaseTypeEngine.getTrunkDatabaseTypeName(metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType())).parse(sql, false);
- SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(metadataContexts.getMetadata(), sqlStatement, connection.getDatabaseName());
+ DatabaseTypeEngine.getTrunkDatabaseTypeName(metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType())).parse(sql, false);
+ SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(metaDataContexts.getMetaData(), sqlStatement, connection.getDatabaseName());
return new QueryContext(sqlStatementContext, sql, Collections.emptyList());
}
private ExecutionContext createExecutionContext(final QueryContext queryContext) throws SQLException {
clearStatements();
SQLCheckEngine.check(queryContext.getSqlStatementContext(), queryContext.getParameters(),
- metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules(),
- connection.getDatabaseName(), metadataContexts.getMetadata().getDatabases(), null);
- return kernelProcessor.generateExecutionContext(queryContext, metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()), metadataContexts.getMetadata().getGlobalRuleMetaData(),
- metadataContexts.getMetadata().getProps(), connection.getConnectionContext());
+ metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules(),
+ connection.getDatabaseName(), metaDataContexts.getMetaData().getDatabases(), null);
+ return kernelProcessor.generateExecutionContext(queryContext, metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()), metaDataContexts.getMetaData().getGlobalRuleMetaData(),
+ metaDataContexts.getMetaData().getProps(), connection.getConnectionContext());
}
private ExecutionGroupContext<JDBCExecutionUnit> createExecutionGroupContext() throws SQLException {
@@ -526,8 +526,8 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
}
private ExecutionGroupContext<RawSQLExecutionUnit> createRawExecutionContext() throws SQLException {
- int maxConnectionsSizePerQuery = metadataContexts.getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY);
- return new RawExecutionPrepareEngine(maxConnectionsSizePerQuery, metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules())
+ int maxConnectionsSizePerQuery = metaDataContexts.getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY);
+ return new RawExecutionPrepareEngine(maxConnectionsSizePerQuery, metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules())
.prepare(executionContext.getRouteContext(), executionContext.getExecutionUnits());
}
@@ -549,7 +549,7 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
} catch (final Exception ex) {
// CHECKSTYLE:ON
connection.rollback();
- throw SQLExceptionTransformEngine.toSQLException(ex, metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
+ throw SQLExceptionTransformEngine.toSQLException(ex, metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType().getType());
}
return result;
}
@@ -571,8 +571,8 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
private JDBCExecutorCallback<Boolean> createExecuteCallback(final ExecuteCallback executeCallback, final SQLStatement sqlStatement) {
boolean isExceptionThrown = SQLExecutorExceptionHandler.isExceptionThrown();
- return new JDBCExecutorCallback<Boolean>(metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType(),
- metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getResourceMetaData().getStorageTypes(), sqlStatement, isExceptionThrown, eventBusContext) {
+ return new JDBCExecutorCallback<Boolean>(metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType(),
+ metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getResourceMetaData().getStorageTypes(), sqlStatement, isExceptionThrown, eventBusContext) {
@Override
protected Boolean executeSQL(final String sql, final Statement statement, final ConnectionMode connectionMode, final DatabaseType storageType) throws SQLException {
@@ -630,8 +630,8 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
}
private MergedResult mergeQuery(final List<QueryResult> queryResults) throws SQLException {
- MergeEngine mergeEngine = new MergeEngine(metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()),
- metadataContexts.getMetadata().getProps(), connection.getConnectionContext());
+ MergeEngine mergeEngine = new MergeEngine(metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()),
+ metaDataContexts.getMetaData().getProps(), connection.getConnectionContext());
return mergeEngine.merge(queryResults, executionContext.getSqlStatementContext());
}
@@ -654,7 +654,7 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
@Override
public boolean isAccumulate() {
- return metadataContexts.getMetadata().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules().stream()
+ return metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules().stream()
.anyMatch(each -> each instanceof DataNodeContainedRule && ((DataNodeContainedRule) each)
.isNeedAccumulate(executionContext.getSqlStatementContext().getTablesContext().getTableNames()));
}
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/executor/AbstractBaseExecutorTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/executor/AbstractBaseExecutorTest.java
index 188fb0aa6d5..1a985056369 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/executor/AbstractBaseExecutorTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/executor/AbstractBaseExecutorTest.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutorExceptionHandler;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.traffic.rule.TrafficRule;
import org.apache.shardingsphere.traffic.rule.builder.DefaultTrafficRuleConfigurationBuilder;
@@ -69,8 +69,8 @@ public abstract class AbstractBaseExecutorTest {
private ContextManager mockContextManager() {
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetadataContexts metadataContexts = mockMetaDataContexts();
- when(result.getMetadataContexts()).thenReturn(metadataContexts);
+ MetaDataContexts metaDataContexts = mockMetaDataContexts();
+ when(result.getMetaDataContexts()).thenReturn(metaDataContexts);
when(result.getDataSourceMap(DefaultDatabase.LOGIC_NAME)).thenReturn(mockDataSourceMap());
return result;
}
@@ -83,16 +83,16 @@ public abstract class AbstractBaseExecutorTest {
return result;
}
- private MetadataContexts mockMetaDataContexts() {
- MetadataContexts result = mock(MetadataContexts.class, RETURNS_DEEP_STUBS);
+ private MetaDataContexts mockMetaDataContexts() {
+ MetaDataContexts result = mock(MetaDataContexts.class, RETURNS_DEEP_STUBS);
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
- when(result.getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(result.getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
TransactionRule transactionRule = mockTransactionRule();
when(globalRuleMetaData.getSingleRule(TransactionRule.class)).thenReturn(transactionRule);
when(globalRuleMetaData.getSingleRule(TrafficRule.class)).thenReturn(new TrafficRule(new DefaultTrafficRuleConfigurationBuilder().build()));
- when(result.getMetadata().getDatabase(DefaultDatabase.LOGIC_NAME).getResourceMetaData().getStorageTypes()).thenReturn(Collections.singletonMap("ds_0", DatabaseTypeFactory.getInstance("H2")));
+ when(result.getMetaData().getDatabase(DefaultDatabase.LOGIC_NAME).getResourceMetaData().getStorageTypes()).thenReturn(Collections.singletonMap("ds_0", DatabaseTypeFactory.getInstance("H2")));
ShardingRule shardingRule = mockShardingRule();
- when(result.getMetadata().getDatabase(DefaultDatabase.LOGIC_NAME).getRuleMetaData().getRules()).thenReturn(Collections.singleton(shardingRule));
+ when(result.getMetaData().getDatabase(DefaultDatabase.LOGIC_NAME).getRuleMetaData().getRules()).thenReturn(Collections.singleton(shardingRule));
return result;
}
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutorTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutorTest.java
index 04bdff7349a..4e4911b8fdf 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutorTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutorTest.java
@@ -63,7 +63,7 @@ public final class BatchPreparedStatementExecutorTest extends AbstractBaseExecut
@Override
public void setUp() throws SQLException {
super.setUp();
- actual = spy(new BatchPreparedStatementExecutor(getConnection().getContextManager().getMetadataContexts(), new JDBCExecutor(getExecutorEngine(), getConnection().getConnectionContext()),
+ actual = spy(new BatchPreparedStatementExecutor(getConnection().getContextManager().getMetaDataContexts(), new JDBCExecutor(getExecutorEngine(), getConnection().getConnectionContext()),
DefaultDatabase.LOGIC_NAME, new EventBusContext()));
when(sqlStatementContext.getTablesContext()).thenReturn(mock(TablesContext.class));
}
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/ConnectionAdapterTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/ConnectionAdapterTest.java
index 47dc4ca7e45..f297e2e7923 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/ConnectionAdapterTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/ConnectionAdapterTest.java
@@ -86,7 +86,7 @@ public final class ConnectionAdapterTest {
private Connection createConnectionAdaptor() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
- when(contextManager.getMetadataContexts().getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
when(globalRuleMetaData.getSingleRule(TransactionRule.class)).thenReturn(mock(TransactionRule.class, RETURNS_DEEP_STUBS));
when(globalRuleMetaData.getSingleRule(TrafficRule.class)).thenReturn(new TrafficRule(new DefaultTrafficRuleConfigurationBuilder().build()));
return new ShardingSphereConnection(DefaultDatabase.LOGIC_NAME, contextManager, mock(JDBCContext.class));
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/PreparedStatementAdapterTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/PreparedStatementAdapterTest.java
index 53313ced24e..f1ae0f8f0f1 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/PreparedStatementAdapterTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/PreparedStatementAdapterTest.java
@@ -72,15 +72,15 @@ public final class PreparedStatementAdapterTest {
ShardingSphereConnection connection = mock(ShardingSphereConnection.class, RETURNS_DEEP_STUBS);
when(connection.getDatabaseName()).thenReturn(DefaultDatabase.LOGIC_NAME);
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
- when(connection.getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(connection.getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
when(globalRuleMetaData.getSingleRule(SQLParserRule.class)).thenReturn(new SQLParserRule(new DefaultSQLParserRuleConfigurationBuilder().build()));
- when(connection.getContextManager().getMetadataContexts().getMetadata().getProps()).thenReturn(new ConfigurationProperties(new Properties()));
- when(connection.getContextManager().getMetadataContexts().getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType()).thenReturn(new MySQLDatabaseType());
- when(connection.getContextManager().getMetadataContexts().getMetadata().getDatabase(connection.getDatabaseName()).getResourceMetaData().getStorageTypes())
+ when(connection.getContextManager().getMetaDataContexts().getMetaData().getProps()).thenReturn(new ConfigurationProperties(new Properties()));
+ when(connection.getContextManager().getMetaDataContexts().getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType()).thenReturn(new MySQLDatabaseType());
+ when(connection.getContextManager().getMetaDataContexts().getMetaData().getDatabase(connection.getDatabaseName()).getResourceMetaData().getStorageTypes())
.thenReturn(Collections.singletonMap("ds_0", new MySQLDatabaseType()));
- when(connection.getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class)).thenReturn(sqlParserRule);
- when(connection.getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData().getSingleRule(TrafficRule.class)).thenReturn(trafficRule);
- when(connection.getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData().getSingleRule(SQLFederationRule.class)).thenReturn(sqlFederationRule);
+ when(connection.getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class)).thenReturn(sqlParserRule);
+ when(connection.getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(TrafficRule.class)).thenReturn(trafficRule);
+ when(connection.getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(SQLFederationRule.class)).thenReturn(sqlFederationRule);
shardingSpherePreparedStatement = new ShardingSpherePreparedStatement(connection, "SELECT 1");
}
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/StatementAdapterTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/StatementAdapterTest.java
index 0ba2f2d7954..6048011b853 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/StatementAdapterTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/StatementAdapterTest.java
@@ -228,8 +228,8 @@ public final class StatementAdapterTest {
private ShardingSphereStatement mockShardingSphereStatement(final Statement... statements) {
ShardingSphereConnection connection = mock(ShardingSphereConnection.class, RETURNS_DEEP_STUBS);
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
- when(connection.getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
- when(connection.getContextManager().getMetadataContexts().getMetadata().getProps()).thenReturn(new ConfigurationProperties(new Properties()));
+ when(connection.getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(connection.getContextManager().getMetaDataContexts().getMetaData().getProps()).thenReturn(new ConfigurationProperties(new Properties()));
when(connection.getDatabaseName()).thenReturn("db");
when(globalRuleMetaData.getSingleRule(TrafficRule.class)).thenReturn(new TrafficRule(new DefaultTrafficRuleConfigurationBuilder().build()));
when(globalRuleMetaData.getSingleRule(SQLFederationRule.class)).thenReturn(new SQLFederationRule(new DefaultSQLFederationRuleConfigurationBuilder().build()));
@@ -243,13 +243,13 @@ public final class StatementAdapterTest {
DataNodeContainedRule rule = mock(DataNodeContainedRule.class);
when(rule.isNeedAccumulate(any())).thenReturn(true);
when(connection.getContextManager()
- .getMetadataContexts().getMetadata().getDatabase(DefaultDatabase.LOGIC_NAME).getRuleMetaData().getRules()).thenReturn(Collections.singletonList(rule));
+ .getMetaDataContexts().getMetaData().getDatabase(DefaultDatabase.LOGIC_NAME).getRuleMetaData().getRules()).thenReturn(Collections.singletonList(rule));
TrafficRule trafficRule = new TrafficRule(new DefaultTrafficRuleConfigurationBuilder().build());
SQLFederationRule sqlFederationRule = new SQLFederationRule(new DefaultSQLFederationRuleConfigurationBuilder().build());
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
when(connection.getDatabaseName()).thenReturn("db");
- when(connection.getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
- when(connection.getContextManager().getMetadataContexts().getMetadata().getProps()).thenReturn(new ConfigurationProperties(new Properties()));
+ when(connection.getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(connection.getContextManager().getMetaDataContexts().getMetaData().getProps()).thenReturn(new ConfigurationProperties(new Properties()));
when(globalRuleMetaData.getSingleRule(TrafficRule.class)).thenReturn(trafficRule);
when(globalRuleMetaData.getSingleRule(SQLFederationRule.class)).thenReturn(sqlFederationRule);
ShardingSphereStatement result = new ShardingSphereStatement(connection);
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManagerTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManagerTest.java
index 991958187ff..d157815e4b2 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManagerTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManagerTest.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.infra.instance.metadata.proxy.ProxyInstanceMeta
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.apache.shardingsphere.traffic.rule.TrafficRule;
import org.apache.shardingsphere.transaction.api.TransactionType;
@@ -83,11 +83,11 @@ public final class ConnectionManagerTest {
private ContextManager mockContextManager() throws SQLException {
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
Map<String, DataSource> dataSourceMap = mockDataSourceMap();
- MetadataPersistService persistService = mockMetaDataPersistService();
+ MetaDataPersistService persistService = mockMetaDataPersistService();
when(result.getDataSourceMap(DefaultDatabase.LOGIC_NAME)).thenReturn(dataSourceMap);
- when(result.getMetadataContexts().getPersistService()).thenReturn(persistService);
+ when(result.getMetaDataContexts().getPersistService()).thenReturn(persistService);
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
- when(result.getMetadataContexts().getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(result.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
when(globalRuleMetaData.getSingleRule(TransactionRule.class)).thenReturn(mock(TransactionRule.class, RETURNS_DEEP_STUBS));
when(globalRuleMetaData.getSingleRule(TrafficRule.class)).thenReturn(mock(TrafficRule.class, RETURNS_DEEP_STUBS));
when(result.getInstanceContext().getAllClusterInstances(InstanceType.PROXY, Arrays.asList("OLTP", "OLAP"))).thenReturn(
@@ -108,8 +108,8 @@ public final class ConnectionManagerTest {
return Collections.singletonMap("127.0.0.1@3307", result);
}
- private MetadataPersistService mockMetaDataPersistService() {
- MetadataPersistService result = mock(MetadataPersistService.class, RETURNS_DEEP_STUBS);
+ private MetaDataPersistService mockMetaDataPersistService() {
+ MetaDataPersistService result = mock(MetaDataPersistService.class, RETURNS_DEEP_STUBS);
when(result.getDataSourceService().load(DefaultDatabase.LOGIC_NAME)).thenReturn(createDataSourcePropertiesMap());
when(result.getGlobalRuleService().loadUsers()).thenReturn(Collections.singletonList(new ShardingSphereUser("root", "root", "localhost")));
return result;
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java
index 8ac684fa755..0ca08fd98a5 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java
@@ -63,7 +63,7 @@ public final class ShardingSphereConnectionTest {
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
when(result.getDataSourceMap(DefaultDatabase.LOGIC_NAME)).thenReturn(Collections.singletonMap("ds", mock(DataSource.class, RETURNS_DEEP_STUBS)));
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
- when(result.getMetadataContexts().getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(result.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
when(globalRuleMetaData.getSingleRule(TransactionRule.class)).thenReturn(mock(TransactionRule.class, RETURNS_DEEP_STUBS));
when(globalRuleMetaData.getSingleRule(TrafficRule.class)).thenReturn(mock(TrafficRule.class));
return result;
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSourceTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSourceTest.java
index f144a5b63b8..9010abc004a 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSourceTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSourceTest.java
@@ -61,7 +61,7 @@ public final class ShardingSphereDataSourceTest {
public void assertNewConstructorWithModeConfigurationOnly() throws SQLException {
ShardingSphereDataSource actual = new ShardingSphereDataSource(DefaultDatabase.LOGIC_NAME, null);
ContextManager contextManager = getContextManager(actual);
- assertNotNull(contextManager.getMetadataContexts().getMetadata().getDatabase(DefaultDatabase.LOGIC_NAME));
+ assertNotNull(contextManager.getMetaDataContexts().getMetaData().getDatabase(DefaultDatabase.LOGIC_NAME));
assertThat(contextManager.getInstanceContext().getInstance().getState().getCurrentState(), is(StateType.OK));
assertTrue(contextManager.getDataSourceMap(DefaultDatabase.LOGIC_NAME).isEmpty());
}
@@ -72,7 +72,7 @@ public final class ShardingSphereDataSourceTest {
when(connection.getMetaData().getURL()).thenReturn("jdbc:mock://127.0.0.1/foo_ds");
ShardingSphereDataSource actual = createShardingSphereDataSource(new MockedDataSource(connection));
ContextManager contextManager = getContextManager(actual);
- assertNotNull(contextManager.getMetadataContexts().getMetadata().getDatabase(DefaultDatabase.LOGIC_NAME));
+ assertNotNull(contextManager.getMetaDataContexts().getMetaData().getDatabase(DefaultDatabase.LOGIC_NAME));
assertThat(contextManager.getInstanceContext().getInstance().getState().getCurrentState(), is(StateType.OK));
assertThat(contextManager.getDataSourceMap(DefaultDatabase.LOGIC_NAME).size(), is(1));
assertThat(contextManager.getDataSourceMap(DefaultDatabase.LOGIC_NAME).get("ds").getConnection().getMetaData().getURL(), is("jdbc:mock://127.0.0.1/foo_ds"));
@@ -86,7 +86,7 @@ public final class ShardingSphereDataSourceTest {
SQLParserRuleConfiguration sqlParserRuleConfig = new SQLParserRuleConfiguration(true, cacheOption, cacheOption);
ShardingSphereDataSource actual = new ShardingSphereDataSource(DefaultDatabase.LOGIC_NAME,
null, Collections.singletonMap("ds", new MockedDataSource(connection)), Arrays.asList(mock(ShardingRuleConfiguration.class), sqlParserRuleConfig), new Properties());
- assertThat(getContextManager(actual).getMetadataContexts().getMetadata().getDatabase(DefaultDatabase.LOGIC_NAME).getRuleMetaData().getConfigurations().size(), is(2));
+ assertThat(getContextManager(actual).getMetaDataContexts().getMetaData().getDatabase(DefaultDatabase.LOGIC_NAME).getRuleMetaData().getConfigurations().size(), is(2));
}
@Test
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaDataTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaDataTest.java
index 9f56f478ec3..f7202b392fd 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaDataTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaDataTest.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.driver.jdbc.core.resultset.DatabaseMetaDataResu
import org.apache.shardingsphere.infra.database.DefaultDatabase;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
@@ -76,7 +76,7 @@ public final class ShardingSphereDatabaseMetaDataTest {
private ShardingSphereConnection shardingSphereConnection;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private MetadataContexts metadataContexts;
+ private MetaDataContexts metaDataContexts;
private final Map<String, DataSource> dataSourceMap = new HashMap<>();
@@ -90,11 +90,11 @@ public final class ShardingSphereDatabaseMetaDataTest {
when(resultSet.getMetaData()).thenReturn(mock(ResultSetMetaData.class));
when(shardingSphereConnection.getConnectionManager().getRandomPhysicalDataSourceName()).thenReturn(DATA_SOURCE_NAME);
when(shardingSphereConnection.getConnectionManager().getRandomConnection()).thenReturn(connection);
- when(shardingSphereConnection.getContextManager().getMetadataContexts()).thenReturn(metadataContexts);
+ when(shardingSphereConnection.getContextManager().getMetaDataContexts()).thenReturn(metaDataContexts);
when(shardingSphereConnection.getContextManager().getDataSourceMap(DefaultDatabase.LOGIC_NAME)).thenReturn(dataSourceMap);
when(shardingSphereConnection.getDatabaseName()).thenReturn(DefaultDatabase.LOGIC_NAME);
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
- when(metadataContexts.getMetadata().getDatabase(shardingSphereConnection.getDatabaseName())).thenReturn(database);
+ when(metaDataContexts.getMetaData().getDatabase(shardingSphereConnection.getDatabaseName())).thenReturn(database);
CachedDatabaseMetaData cachedDatabaseMetaData = new CachedDatabaseMetaData(databaseMetaData);
when(shardingSphereConnection.getJdbcContext().getCachedDatabaseMetaData()).thenReturn(cachedDatabaseMetaData);
ShardingRule shardingRule = mockShardingRule();
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetTest.java
index 70186244f7b..c9a6b48bd19 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetTest.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.executor.sql.context.ExecutionContext;
import org.apache.shardingsphere.infra.merge.result.MergedResult;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.junit.Before;
import org.junit.Test;
@@ -95,9 +95,9 @@ public final class ShardingSphereResultSetTest {
private ShardingSphereStatement getShardingSphereStatement() {
ShardingSphereConnection connection = mock(ShardingSphereConnection.class, RETURNS_DEEP_STUBS);
- MetadataContexts metadataContexts = mock(MetadataContexts.class, RETURNS_DEEP_STUBS);
- when(metadataContexts.getMetadata().getProps()).thenReturn(new ConfigurationProperties(new Properties()));
- when(connection.getContextManager().getMetadataContexts()).thenReturn(metadataContexts);
+ MetaDataContexts metaDataContexts = mock(MetaDataContexts.class, RETURNS_DEEP_STUBS);
+ when(metaDataContexts.getMetaData().getProps()).thenReturn(new ConfigurationProperties(new Properties()));
+ when(connection.getContextManager().getMetaDataContexts()).thenReturn(metaDataContexts);
ShardingSphereStatement result = mock(ShardingSphereStatement.class);
when(result.getConnection()).thenReturn(connection);
return result;
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptPreparedStatementTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptPreparedStatementTest.java
index 561c3c09451..5ff1e408ef2 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptPreparedStatementTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptPreparedStatementTest.java
@@ -55,7 +55,7 @@ public final class EncryptPreparedStatementTest extends AbstractShardingSphereDa
@Test
public void assertSQLShow() {
- assertTrue(getEncryptConnectionWithProps().getContextManager().getMetadataContexts().getMetadata().getProps().<Boolean>getValue(ConfigurationPropertyKey.SQL_SHOW));
+ assertTrue(getEncryptConnectionWithProps().getContextManager().getMetaDataContexts().getMetaData().getProps().<Boolean>getValue(ConfigurationPropertyKey.SQL_SHOW));
}
@Test
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptStatementTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptStatementTest.java
index c0f7d8d1c28..d3cd6ec9f2c 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptStatementTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptStatementTest.java
@@ -58,7 +58,7 @@ public final class EncryptStatementTest extends AbstractShardingSphereDataSource
@Test
public void assertSQLShow() {
- assertTrue(getEncryptConnectionWithProps().getContextManager().getMetadataContexts().getMetadata().getProps().<Boolean>getValue(ConfigurationPropertyKey.SQL_SHOW));
+ assertTrue(getEncryptConnectionWithProps().getContextManager().getMetaDataContexts().getMetaData().getProps().<Boolean>getValue(ConfigurationPropertyKey.SQL_SHOW));
}
@Test
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedOperationConnectionTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedOperationConnectionTest.java
index b16b71516bc..9bff5e5a3fa 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedOperationConnectionTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedOperationConnectionTest.java
@@ -44,7 +44,7 @@ public final class UnsupportedOperationConnectionTest {
public UnsupportedOperationConnectionTest() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
- when(contextManager.getMetadataContexts().getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
when(globalRuleMetaData.getSingleRule(TransactionRule.class)).thenReturn(mock(TransactionRule.class, RETURNS_DEEP_STUBS));
when(globalRuleMetaData.getSingleRule(TrafficRule.class)).thenReturn(mock(TrafficRule.class));
shardingSphereConnection = new ShardingSphereConnection(DefaultDatabase.LOGIC_NAME, contextManager, mock(JDBCContext.class));
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedOperationPreparedStatementTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedOperationPreparedStatementTest.java
index 737047ed53c..ca5426fed44 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedOperationPreparedStatementTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedOperationPreparedStatementTest.java
@@ -57,9 +57,9 @@ public final class UnsupportedOperationPreparedStatementTest {
ShardingSphereConnection connection = mock(ShardingSphereConnection.class, RETURNS_DEEP_STUBS);
when(connection.getDatabaseName()).thenReturn(DefaultDatabase.LOGIC_NAME);
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
- when(connection.getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
- when(connection.getContextManager().getMetadataContexts().getMetadata().getDatabase(connection.getDatabaseName()).getProtocolType()).thenReturn(new MySQLDatabaseType());
- when(connection.getContextManager().getMetadataContexts().getMetadata().getProps()).thenReturn(new ConfigurationProperties(new Properties()));
+ when(connection.getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(connection.getContextManager().getMetaDataContexts().getMetaData().getDatabase(connection.getDatabaseName()).getProtocolType()).thenReturn(new MySQLDatabaseType());
+ when(connection.getContextManager().getMetaDataContexts().getMetaData().getProps()).thenReturn(new ConfigurationProperties(new Properties()));
when(globalRuleMetaData.getSingleRule(SQLParserRule.class)).thenReturn(sqlParserRule);
when(globalRuleMetaData.getSingleRule(TrafficRule.class)).thenReturn(trafficRule);
when(globalRuleMetaData.getSingleRule(SQLFederationRule.class)).thenReturn(sqlFederationRule);
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedOperationStatementTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedOperationStatementTest.java
index f7710aa3e63..680dbd16bbe 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedOperationStatementTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedOperationStatementTest.java
@@ -47,8 +47,8 @@ public final class UnsupportedOperationStatementTest {
TrafficRule trafficRule = new TrafficRule(new DefaultTrafficRuleConfigurationBuilder().build());
SQLFederationRule sqlFederationRule = new SQLFederationRule(new DefaultSQLFederationRuleConfigurationBuilder().build());
when(connection.getDatabaseName()).thenReturn("db");
- when(connection.getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
- when(connection.getContextManager().getMetadataContexts().getMetadata().getProps()).thenReturn(new ConfigurationProperties(new Properties()));
+ when(connection.getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(connection.getContextManager().getMetaDataContexts().getMetaData().getProps()).thenReturn(new ConfigurationProperties(new Properties()));
when(globalRuleMetaData.getSingleRule(TrafficRule.class)).thenReturn(trafficRule);
when(globalRuleMetaData.getSingleRule(SQLFederationRule.class)).thenReturn(sqlFederationRule);
shardingSphereStatement = new ShardingSphereStatement(connection);
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/state/DriverStateContextTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/state/DriverStateContextTest.java
index 7a7f1ae1ff8..7fddadbe748 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/state/DriverStateContextTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/state/DriverStateContextTest.java
@@ -27,8 +27,8 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.state.StateContext;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.traffic.rule.TrafficRule;
import org.apache.shardingsphere.transaction.core.TransactionTypeHolder;
import org.apache.shardingsphere.transaction.rule.TransactionRule;
@@ -62,9 +62,9 @@ public final class DriverStateContextTest {
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
when(globalRuleMetaData.getSingleRule(TransactionRule.class)).thenReturn(mock(TransactionRule.class, RETURNS_DEEP_STUBS));
when(globalRuleMetaData.getSingleRule(TrafficRule.class)).thenReturn(mock(TrafficRule.class));
- MetadataPersistService mockedPersistService = mock(MetadataPersistService.class);
- MetadataContexts metadataContexts = new MetadataContexts(mockedPersistService, new ShardingSphereMetaData(databases, globalRuleMetaData, mock(ConfigurationProperties.class)));
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ MetaDataPersistService mockedPersistService = mock(MetaDataPersistService.class);
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mockedPersistService, new ShardingSphereMetaData(databases, globalRuleMetaData, mock(ConfigurationProperties.class)));
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
when(contextManager.getInstanceContext().getInstance().getState()).thenReturn(new StateContext());
}
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/state/ok/OKDriverStateTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/state/ok/OKDriverStateTest.java
index 841a79566e3..d201e441982 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/state/ok/OKDriverStateTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/state/ok/OKDriverStateTest.java
@@ -42,7 +42,7 @@ public final class OKDriverStateTest {
public void assertGetConnection() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
- when(contextManager.getMetadataContexts().getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
when(globalRuleMetaData.getSingleRule(TransactionRule.class)).thenReturn(mock(TransactionRule.class, RETURNS_DEEP_STUBS));
when(globalRuleMetaData.getSingleRule(TrafficRule.class)).thenReturn(mock(TrafficRule.class));
Connection actual = new OKDriverState().getConnection(DefaultDatabase.LOGIC_NAME, contextManager, mock(JDBCContext.class));
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/PipelineAPIFactory.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/PipelineAPIFactory.java
index 482d28a47ab..1fe434122bb 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/PipelineAPIFactory.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/PipelineAPIFactory.java
@@ -53,7 +53,7 @@ public final class PipelineAPIFactory {
@Override
protected GovernanceRepositoryAPI initialize() {
- return new GovernanceRepositoryAPIImpl((ClusterPersistRepository) PipelineContext.getContextManager().getMetadataContexts().getPersistService().getRepository());
+ return new GovernanceRepositoryAPIImpl((ClusterPersistRepository) PipelineContext.getContextManager().getMetaDataContexts().getPersistService().getRepository());
}
};
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/execute/ShardingSphereDataJobWorker.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/execute/ShardingSphereDataJobWorker.java
index d4199d6f706..be877333ee3 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/execute/ShardingSphereDataJobWorker.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/execute/ShardingSphereDataJobWorker.java
@@ -42,7 +42,7 @@ public final class ShardingSphereDataJobWorker {
if (WORKER_INITIALIZED.get()) {
return;
}
- boolean collectorEnabled = contextManager.getMetadataContexts().getMetadata().getInternalProps().getValue(InternalConfigurationPropertyKey.PROXY_METADATA_COLLECTOR_ENABLED);
+ boolean collectorEnabled = contextManager.getMetaDataContexts().getMetaData().getInternalProps().getValue(InternalConfigurationPropertyKey.PROXY_METADATA_COLLECTOR_ENABLED);
if (collectorEnabled) {
startScheduleThread(contextManager);
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/execute/ShardingSphereDataScheduleCollector.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/execute/ShardingSphereDataScheduleCollector.java
index 7f57ff18781..756e499c216 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/execute/ShardingSphereDataScheduleCollector.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/execute/ShardingSphereDataScheduleCollector.java
@@ -71,8 +71,8 @@ public final class ShardingSphereDataScheduleCollector {
@Override
public void run() {
- ShardingSphereData shardingSphereData = contextManager.getMetadataContexts().getShardingSphereData();
- ShardingSphereMetaData metaData = contextManager.getMetadataContexts().getMetadata();
+ ShardingSphereData shardingSphereData = contextManager.getMetaDataContexts().getShardingSphereData();
+ ShardingSphereMetaData metaData = contextManager.getMetaDataContexts().getMetaData();
ShardingSphereData changedShardingSphereData = new ShardingSphereData();
shardingSphereData.getDatabaseData().forEach((key, value) -> {
if (metaData.containsDatabase(key)) {
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/PipelineJobPreparerUtils.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/PipelineJobPreparerUtils.java
index 2b6c6c2a1f1..d62c70f4fc2 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/PipelineJobPreparerUtils.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/PipelineJobPreparerUtils.java
@@ -90,7 +90,7 @@ public final class PipelineJobPreparerUtils {
* @return SQL parser engine
*/
public static ShardingSphereSQLParserEngine getSQLParserEngine(final String targetDatabaseName) {
- ShardingSphereMetaData metaData = PipelineContext.getContextManager().getMetadataContexts().getMetadata();
+ ShardingSphereMetaData metaData = PipelineContext.getContextManager().getMetaDataContexts().getMetaData();
ShardingSphereDatabase database = metaData.getDatabase(targetDatabaseName);
return metaData.getGlobalRuleMetaData().getSingleRule(SQLParserRule.class).getSQLParserEngine(database.getProtocolType().getType());
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/spi/impl/PipelineDistributedBarrierImpl.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/spi/impl/PipelineDistributedBarrierImpl.java
index 801ca7aa079..eb05f3c323e 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/spi/impl/PipelineDistributedBarrierImpl.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/spi/impl/PipelineDistributedBarrierImpl.java
@@ -44,7 +44,7 @@ public final class PipelineDistributedBarrierImpl implements PipelineDistributed
@Override
protected ClusterPersistRepository initialize() {
- return (ClusterPersistRepository) PipelineContext.getContextManager().getMetadataContexts().getPersistService().getRepository();
+ return (ClusterPersistRepository) PipelineContext.getContextManager().getMetaDataContexts().getPersistService().getRepository();
}
};
diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/execute/ShardingSphereDataCollectorTest.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/execute/ShardingSphereDataCollectorTest.java
index 3cd672dfb90..c4c0dfff998 100644
--- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/execute/ShardingSphereDataCollectorTest.java
+++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/execute/ShardingSphereDataCollectorTest.java
@@ -48,10 +48,10 @@ public final class ShardingSphereDataCollectorTest {
public void assertCollect() throws InterruptedException {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
ShardingSphereData shardingSphereData = mockShardingSphereData();
- when(contextManager.getMetadataContexts().getShardingSphereData()).thenReturn(shardingSphereData);
+ when(contextManager.getMetaDataContexts().getShardingSphereData()).thenReturn(shardingSphereData);
ShardingSphereMetaData metaData = mockMetaData();
- when(contextManager.getMetadataContexts().getMetadata()).thenReturn(metaData);
- when(contextManager.getMetadataContexts().getMetadata().getProps()).thenReturn(new ConfigurationProperties(new Properties()));
+ when(contextManager.getMetaDataContexts().getMetaData()).thenReturn(metaData);
+ when(contextManager.getMetaDataContexts().getMetaData().getProps()).thenReturn(new ConfigurationProperties(new Properties()));
new ShardingSphereDataScheduleCollector(contextManager).start();
Thread.sleep(100L);
verify(contextManager, atLeastOnce()).getInstanceContext();
diff --git a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/impl/MigrationJobAPIImpl.java b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/impl/MigrationJobAPIImpl.java
index b46b9fa9700..a04dd264549 100644
--- a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/impl/MigrationJobAPIImpl.java
+++ b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/impl/MigrationJobAPIImpl.java
@@ -417,7 +417,7 @@ public final class MigrationJobAPIImpl extends AbstractInventoryIncrementalJobAP
result.setSourceSchemaName(sourceSchemaName);
result.setSourceTableName(param.getSourceTableName());
Map<String, Map<String, Object>> targetDataSourceProps = new HashMap<>();
- ShardingSphereDatabase targetDatabase = PipelineContext.getContextManager().getMetadataContexts().getMetadata().getDatabase(param.getTargetDatabaseName());
+ ShardingSphereDatabase targetDatabase = PipelineContext.getContextManager().getMetaDataContexts().getMetaData().getDatabase(param.getTargetDatabaseName());
for (Entry<String, DataSource> entry : targetDatabase.getResourceMetaData().getDataSources().entrySet()) {
Map<String, Object> dataSourceProps = swapper.swapToMap(DataSourcePropertiesCreator.create(entry.getValue()));
targetDataSourceProps.put(entry.getKey(), dataSourceProps);
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
index b23b150a09d..40914ec0d67 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
@@ -53,8 +53,8 @@ import org.apache.shardingsphere.infra.yaml.data.pojo.YamlShardingSphereRowData;
import org.apache.shardingsphere.infra.yaml.data.swapper.YamlShardingSphereRowDataSwapper;
import org.apache.shardingsphere.mode.manager.switcher.ResourceSwitchManager;
import org.apache.shardingsphere.mode.manager.switcher.SwitchingResource;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import javax.sql.DataSource;
import java.sql.SQLException;
@@ -77,25 +77,25 @@ import java.util.stream.Collectors;
@Slf4j
public final class ContextManager implements AutoCloseable {
- private volatile MetadataContexts metadataContexts;
+ private volatile MetaDataContexts metaDataContexts;
private final InstanceContext instanceContext;
private final ExecutorEngine executorEngine;
- public ContextManager(final MetadataContexts metadataContexts, final InstanceContext instanceContext) {
- this.metadataContexts = metadataContexts;
+ public ContextManager(final MetaDataContexts metaDataContexts, final InstanceContext instanceContext) {
+ this.metaDataContexts = metaDataContexts;
this.instanceContext = instanceContext;
- executorEngine = ExecutorEngine.createExecutorEngineWithSize(metadataContexts.getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE));
+ executorEngine = ExecutorEngine.createExecutorEngineWithSize(metaDataContexts.getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE));
}
/**
- * Renew Metadata contexts.
+ * Renew meta data contexts.
*
- * @param metadataContexts Metadata contexts
+ * @param metaDataContexts meta data contexts
*/
- public synchronized void renewMetadataContexts(final MetadataContexts metadataContexts) {
- this.metadataContexts = metadataContexts;
+ public synchronized void renewMetaDataContexts(final MetaDataContexts metaDataContexts) {
+ this.metaDataContexts = metaDataContexts;
}
/**
@@ -105,7 +105,7 @@ public final class ContextManager implements AutoCloseable {
* @return data source map
*/
public Map<String, DataSource> getDataSourceMap(final String databaseName) {
- return metadataContexts.getMetadata().getDatabase(databaseName).getResourceMetaData().getDataSources();
+ return metaDataContexts.getMetaData().getDatabase(databaseName).getResourceMetaData().getDataSources();
}
/**
@@ -114,11 +114,11 @@ public final class ContextManager implements AutoCloseable {
* @param databaseName database name
*/
public synchronized void addDatabase(final String databaseName) {
- if (metadataContexts.getMetadata().containsDatabase(databaseName)) {
+ if (metaDataContexts.getMetaData().containsDatabase(databaseName)) {
return;
}
- DatabaseType protocolType = DatabaseTypeEngine.getProtocolType(Collections.emptyMap(), metadataContexts.getMetadata().getProps());
- metadataContexts.getMetadata().addDatabase(databaseName, protocolType);
+ DatabaseType protocolType = DatabaseTypeEngine.getProtocolType(Collections.emptyMap(), metaDataContexts.getMetaData().getProps());
+ metaDataContexts.getMetaData().addDatabase(databaseName, protocolType);
}
/**
@@ -127,12 +127,12 @@ public final class ContextManager implements AutoCloseable {
* @param databaseName database name
*/
public synchronized void addDatabaseAndPersist(final String databaseName) {
- if (metadataContexts.getMetadata().containsDatabase(databaseName)) {
+ if (metaDataContexts.getMetaData().containsDatabase(databaseName)) {
return;
}
- DatabaseType protocolType = DatabaseTypeEngine.getProtocolType(Collections.emptyMap(), metadataContexts.getMetadata().getProps());
- metadataContexts.getMetadata().addDatabase(databaseName, protocolType);
- metadataContexts.getPersistService().getDatabaseMetadataService().addDatabase(databaseName);
+ DatabaseType protocolType = DatabaseTypeEngine.getProtocolType(Collections.emptyMap(), metaDataContexts.getMetaData().getProps());
+ metaDataContexts.getMetaData().addDatabase(databaseName, protocolType);
+ metaDataContexts.getPersistService().getDatabaseMetaDataService().addDatabase(databaseName);
}
/**
@@ -141,11 +141,11 @@ public final class ContextManager implements AutoCloseable {
* @param databaseName database name
*/
public synchronized void dropDatabase(final String databaseName) {
- if (!metadataContexts.getMetadata().containsDatabase(databaseName)) {
+ if (!metaDataContexts.getMetaData().containsDatabase(databaseName)) {
return;
}
- String actualDatabaseName = metadataContexts.getMetadata().getActualDatabaseName(databaseName);
- metadataContexts.getMetadata().dropDatabase(actualDatabaseName);
+ String actualDatabaseName = metaDataContexts.getMetaData().getActualDatabaseName(databaseName);
+ metaDataContexts.getMetaData().dropDatabase(actualDatabaseName);
}
/**
@@ -154,12 +154,12 @@ public final class ContextManager implements AutoCloseable {
* @param databaseName database name
*/
public synchronized void dropDatabaseAndPersist(final String databaseName) {
- if (!metadataContexts.getMetadata().containsDatabase(databaseName)) {
+ if (!metaDataContexts.getMetaData().containsDatabase(databaseName)) {
return;
}
- String actualDatabaseName = metadataContexts.getMetadata().getActualDatabaseName(databaseName);
- metadataContexts.getMetadata().dropDatabase(actualDatabaseName);
- metadataContexts.getPersistService().getDatabaseMetadataService().dropDatabase(actualDatabaseName);
+ String actualDatabaseName = metaDataContexts.getMetaData().getActualDatabaseName(databaseName);
+ metaDataContexts.getMetaData().dropDatabase(actualDatabaseName);
+ metaDataContexts.getPersistService().getDatabaseMetaDataService().dropDatabase(actualDatabaseName);
}
/**
@@ -169,10 +169,10 @@ public final class ContextManager implements AutoCloseable {
* @param schemaName schema name
*/
public synchronized void addSchema(final String databaseName, final String schemaName) {
- if (metadataContexts.getMetadata().getDatabase(databaseName).containsSchema(schemaName)) {
+ if (metaDataContexts.getMetaData().getDatabase(databaseName).containsSchema(schemaName)) {
return;
}
- metadataContexts.getMetadata().getDatabase(databaseName).putSchema(schemaName, new ShardingSphereSchema());
+ metaDataContexts.getMetaData().getDatabase(databaseName).putSchema(schemaName, new ShardingSphereSchema());
}
/**
@@ -184,7 +184,7 @@ public final class ContextManager implements AutoCloseable {
* @param toBeDeletedViewName to be deleted view name
*/
public synchronized void alterSchema(final String databaseName, final String schemaName, final String toBeDeletedTableName, final String toBeDeletedViewName) {
- if (!metadataContexts.getMetadata().containsDatabase(databaseName) || !metadataContexts.getMetadata().getDatabase(databaseName).containsSchema(schemaName)) {
+ if (!metaDataContexts.getMetaData().containsDatabase(databaseName) || !metaDataContexts.getMetaData().getDatabase(databaseName).containsSchema(schemaName)) {
return;
}
Optional.ofNullable(toBeDeletedTableName).ifPresent(optional -> dropTable(databaseName, schemaName, optional));
@@ -200,7 +200,7 @@ public final class ContextManager implements AutoCloseable {
* @param toBeChangedView to be changed view
*/
public synchronized void alterSchema(final String databaseName, final String schemaName, final ShardingSphereTable toBeChangedTable, final ShardingSphereView toBeChangedView) {
- if (!metadataContexts.getMetadata().containsDatabase(databaseName) || !metadataContexts.getMetadata().getDatabase(databaseName).containsSchema(schemaName)) {
+ if (!metaDataContexts.getMetaData().containsDatabase(databaseName) || !metaDataContexts.getMetaData().getDatabase(databaseName).containsSchema(schemaName)) {
return;
}
Optional.ofNullable(toBeChangedTable).ifPresent(optional -> alterTable(databaseName, schemaName, optional));
@@ -208,19 +208,19 @@ public final class ContextManager implements AutoCloseable {
}
private synchronized void dropTable(final String databaseName, final String schemaName, final String toBeDeletedTableName) {
- metadataContexts.getMetadata().getDatabase(databaseName).getSchema(schemaName).removeTable(toBeDeletedTableName);
- metadataContexts.getMetadata().getDatabase(databaseName).getRuleMetaData().getRules().stream().filter(each -> each instanceof MutableDataNodeRule).findFirst()
+ metaDataContexts.getMetaData().getDatabase(databaseName).getSchema(schemaName).removeTable(toBeDeletedTableName);
+ metaDataContexts.getMetaData().getDatabase(databaseName).getRuleMetaData().getRules().stream().filter(each -> each instanceof MutableDataNodeRule).findFirst()
.ifPresent(optional -> ((MutableDataNodeRule) optional).remove(schemaName, toBeDeletedTableName));
}
private synchronized void dropView(final String databaseName, final String schemaName, final String toBeDeletedViewName) {
- metadataContexts.getMetadata().getDatabase(databaseName).getSchema(schemaName).removeView(toBeDeletedViewName);
- metadataContexts.getMetadata().getDatabase(databaseName).getRuleMetaData().getRules().stream().filter(each -> each instanceof MutableDataNodeRule).findFirst()
+ metaDataContexts.getMetaData().getDatabase(databaseName).getSchema(schemaName).removeView(toBeDeletedViewName);
+ metaDataContexts.getMetaData().getDatabase(databaseName).getRuleMetaData().getRules().stream().filter(each -> each instanceof MutableDataNodeRule).findFirst()
.ifPresent(optional -> ((MutableDataNodeRule) optional).remove(schemaName, toBeDeletedViewName));
}
private synchronized void alterTable(final String databaseName, final String schemaName, final ShardingSphereTable beBoChangedTable) {
- ShardingSphereDatabase database = metadataContexts.getMetadata().getDatabase(databaseName);
+ ShardingSphereDatabase database = metaDataContexts.getMetaData().getDatabase(databaseName);
if (!containsMutableDataNodeRule(database, beBoChangedTable.getName())) {
database.reloadRules(MutableDataNodeRule.class);
}
@@ -228,7 +228,7 @@ public final class ContextManager implements AutoCloseable {
}
private synchronized void alterView(final String databaseName, final String schemaName, final ShardingSphereView beBoChangedView) {
- ShardingSphereDatabase database = metadataContexts.getMetadata().getDatabase(databaseName);
+ ShardingSphereDatabase database = metaDataContexts.getMetaData().getDatabase(databaseName);
if (!containsMutableDataNodeRule(database, beBoChangedView.getName())) {
database.reloadRules(MutableDataNodeRule.class);
}
@@ -247,7 +247,7 @@ public final class ContextManager implements AutoCloseable {
* @param schemaName schema name
*/
public synchronized void dropSchema(final String databaseName, final String schemaName) {
- ShardingSphereDatabase database = metadataContexts.getMetadata().getDatabase(databaseName);
+ ShardingSphereDatabase database = metaDataContexts.getMetaData().getDatabase(databaseName);
if (null == database || !database.containsSchema(schemaName)) {
return;
}
@@ -262,12 +262,12 @@ public final class ContextManager implements AutoCloseable {
* @throws SQLException SQL exception
*/
public synchronized void addResources(final String databaseName, final Map<String, DataSourceProperties> toBeAddedDataSourcePropsMap) throws SQLException {
- SwitchingResource switchingResource = new ResourceSwitchManager().create(metadataContexts.getMetadata().getDatabase(databaseName).getResourceMetaData(), toBeAddedDataSourcePropsMap);
- metadataContexts.getMetadata().getDatabases().putAll(createChangedDatabases(databaseName, switchingResource, null));
- metadataContexts.getMetadata().getGlobalRuleMetaData().findRules(ResourceHeldRule.class).forEach(each -> each.addResource(metadataContexts.getMetadata().getDatabase(databaseName)));
- metadataContexts.getMetadata().getDatabase(databaseName).getSchemas().forEach((schemaName, schema) -> metadataContexts.getPersistService().getDatabaseMetadataService()
- .persist(metadataContexts.getMetadata().getActualDatabaseName(databaseName), schemaName, schema));
- metadataContexts.getPersistService().getDataSourceService().append(metadataContexts.getMetadata().getActualDatabaseName(databaseName), toBeAddedDataSourcePropsMap);
+ SwitchingResource switchingResource = new ResourceSwitchManager().create(metaDataContexts.getMetaData().getDatabase(databaseName).getResourceMetaData(), toBeAddedDataSourcePropsMap);
+ metaDataContexts.getMetaData().getDatabases().putAll(createChangedDatabases(databaseName, switchingResource, null));
+ metaDataContexts.getMetaData().getGlobalRuleMetaData().findRules(ResourceHeldRule.class).forEach(each -> each.addResource(metaDataContexts.getMetaData().getDatabase(databaseName)));
+ metaDataContexts.getMetaData().getDatabase(databaseName).getSchemas().forEach((schemaName, schema) -> metaDataContexts.getPersistService().getDatabaseMetaDataService()
+ .persist(metaDataContexts.getMetaData().getActualDatabaseName(databaseName), schemaName, schema));
+ metaDataContexts.getPersistService().getDataSourceService().append(metaDataContexts.getMetaData().getActualDatabaseName(databaseName), toBeAddedDataSourcePropsMap);
switchingResource.closeStaleDataSources();
}
@@ -279,11 +279,11 @@ public final class ContextManager implements AutoCloseable {
* @throws SQLException SQL exception
*/
public synchronized void updateResources(final String databaseName, final Map<String, DataSourceProperties> toBeUpdatedDataSourcePropsMap) throws SQLException {
- SwitchingResource switchingResource = new ResourceSwitchManager().create(metadataContexts.getMetadata().getDatabase(databaseName).getResourceMetaData(), toBeUpdatedDataSourcePropsMap);
- metadataContexts.getMetadata().getDatabases().putAll(createChangedDatabases(databaseName, switchingResource, null));
- metadataContexts.getMetadata().getGlobalRuleMetaData().findRules(ResourceHeldRule.class).forEach(each -> each.addResource(metadataContexts.getMetadata().getDatabase(databaseName)));
- metadataContexts.getMetadata().getDatabases().putAll(newShardingSphereDatabase(metadataContexts.getMetadata().getDatabase(databaseName)));
- metadataContexts.getPersistService().getDataSourceService().append(metadataContexts.getMetadata().getActualDatabaseName(databaseName), toBeUpdatedDataSourcePropsMap);
+ SwitchingResource switchingResource = new ResourceSwitchManager().create(metaDataContexts.getMetaData().getDatabase(databaseName).getResourceMetaData(), toBeUpdatedDataSourcePropsMap);
+ metaDataContexts.getMetaData().getDatabases().putAll(createChangedDatabases(databaseName, switchingResource, null));
+ metaDataContexts.getMetaData().getGlobalRuleMetaData().findRules(ResourceHeldRule.class).forEach(each -> each.addResource(metaDataContexts.getMetaData().getDatabase(databaseName)));
+ metaDataContexts.getMetaData().getDatabases().putAll(newShardingSphereDatabase(metaDataContexts.getMetaData().getDatabase(databaseName)));
+ metaDataContexts.getPersistService().getDataSourceService().append(metaDataContexts.getMetaData().getActualDatabaseName(databaseName), toBeUpdatedDataSourcePropsMap);
switchingResource.closeStaleDataSources();
}
@@ -296,17 +296,17 @@ public final class ContextManager implements AutoCloseable {
*/
public synchronized void dropResources(final String databaseName, final Collection<String> toBeDroppedResourceNames) throws SQLException {
// TODO should check to be dropped resources are unused here. ContextManager is atomic domain to maintain metadata, not DistSQL handler
- Map<String, DataSourceProperties> dataSourcePropsMap = metadataContexts.getPersistService().getDataSourceService().load(metadataContexts.getMetadata().getActualDatabaseName(databaseName));
+ Map<String, DataSourceProperties> dataSourcePropsMap = metaDataContexts.getPersistService().getDataSourceService().load(metaDataContexts.getMetaData().getActualDatabaseName(databaseName));
Map<String, DataSourceProperties> toBeDeletedDataSourcePropsMap = getToBeDeletedDataSourcePropsMap(dataSourcePropsMap, toBeDroppedResourceNames);
SwitchingResource switchingResource =
- new ResourceSwitchManager().createByDropResource(metadataContexts.getMetadata().getDatabase(databaseName).getResourceMetaData(), toBeDeletedDataSourcePropsMap);
- metadataContexts.getMetadata().getDatabases().putAll(renewDatabase(metadataContexts.getMetadata().getDatabase(databaseName), switchingResource));
- MetadataContexts reloadMetadataContexts = createMetadataContexts(databaseName, switchingResource, null);
- alterSchemaMetadata(databaseName, reloadMetadataContexts.getMetadata().getDatabase(databaseName), metadataContexts.getMetadata().getDatabase(databaseName));
- deletedSchemaNames(databaseName, reloadMetadataContexts.getMetadata().getDatabase(databaseName), metadataContexts.getMetadata().getDatabase(databaseName));
- metadataContexts = reloadMetadataContexts;
+ new ResourceSwitchManager().createByDropResource(metaDataContexts.getMetaData().getDatabase(databaseName).getResourceMetaData(), toBeDeletedDataSourcePropsMap);
+ metaDataContexts.getMetaData().getDatabases().putAll(renewDatabase(metaDataContexts.getMetaData().getDatabase(databaseName), switchingResource));
+ MetaDataContexts reloadMetaDataContexts = createMetaDataContexts(databaseName, switchingResource, null);
+ alterSchemaMetaData(databaseName, reloadMetaDataContexts.getMetaData().getDatabase(databaseName), metaDataContexts.getMetaData().getDatabase(databaseName));
+ deletedSchemaNames(databaseName, reloadMetaDataContexts.getMetaData().getDatabase(databaseName), metaDataContexts.getMetaData().getDatabase(databaseName));
+ metaDataContexts = reloadMetaDataContexts;
Map<String, DataSourceProperties> toBeReversedDataSourcePropsMap = getToBeReversedDataSourcePropsMap(dataSourcePropsMap, toBeDroppedResourceNames);
- metadataContexts.getPersistService().getDataSourceService().persist(metadataContexts.getMetadata().getActualDatabaseName(databaseName), toBeReversedDataSourcePropsMap);
+ metaDataContexts.getPersistService().getDataSourceService().persist(metaDataContexts.getMetaData().getActualDatabaseName(databaseName), toBeReversedDataSourcePropsMap);
switchingResource.closeStaleDataSources();
}
@@ -329,11 +329,11 @@ public final class ContextManager implements AutoCloseable {
return dataSourcePropsMap.entrySet().stream().filter(entry -> !toBeDroppedResourceNames.contains(entry.getKey())).collect(Collectors.toMap(Entry::getKey, Entry::getValue));
}
- private synchronized void alterSchemaMetadata(final String databaseName, final ShardingSphereDatabase reloadDatabase, final ShardingSphereDatabase currentDatabase) {
+ private synchronized void alterSchemaMetaData(final String databaseName, final ShardingSphereDatabase reloadDatabase, final ShardingSphereDatabase currentDatabase) {
Map<String, ShardingSphereSchema> toBeDeletedTables = SchemaManager.getToBeDeletedTablesBySchemas(reloadDatabase.getSchemas(), currentDatabase.getSchemas());
Map<String, ShardingSphereSchema> toBeAddedTables = SchemaManager.getToBeAddedTablesBySchemas(reloadDatabase.getSchemas(), currentDatabase.getSchemas());
- toBeAddedTables.forEach((key, value) -> metadataContexts.getPersistService().getDatabaseMetadataService().persist(databaseName, key, value));
- toBeDeletedTables.forEach((key, value) -> metadataContexts.getPersistService().getDatabaseMetadataService().delete(databaseName, key, value));
+ toBeAddedTables.forEach((key, value) -> metaDataContexts.getPersistService().getDatabaseMetaDataService().persist(databaseName, key, value));
+ toBeDeletedTables.forEach((key, value) -> metaDataContexts.getPersistService().getDatabaseMetaDataService().delete(databaseName, key, value));
}
/**
@@ -347,10 +347,10 @@ public final class ContextManager implements AutoCloseable {
try {
Collection<ResourceHeldRule> staleResourceHeldRules = getStaleResourceHeldRules(databaseName);
staleResourceHeldRules.forEach(ResourceHeldRule::closeStaleResource);
- MetadataContexts reloadMetadataContexts = createMetadataContexts(databaseName, null, ruleConfigs);
- alterSchemaMetadata(databaseName, reloadMetadataContexts.getMetadata().getDatabase(databaseName), metadataContexts.getMetadata().getDatabase(databaseName));
- metadataContexts = reloadMetadataContexts;
- metadataContexts.getMetadata().getDatabases().putAll(newShardingSphereDatabase(metadataContexts.getMetadata().getDatabase(databaseName)));
+ MetaDataContexts reloadMetaDataContexts = createMetaDataContexts(databaseName, null, ruleConfigs);
+ alterSchemaMetaData(databaseName, reloadMetaDataContexts.getMetaData().getDatabase(databaseName), metaDataContexts.getMetaData().getDatabase(databaseName));
+ metaDataContexts = reloadMetaDataContexts;
+ metaDataContexts.getMetaData().getDatabases().putAll(newShardingSphereDatabase(metaDataContexts.getMetaData().getDatabase(databaseName)));
} catch (final SQLException ex) {
log.error("Alter database: {} rule configurations failed", databaseName, ex);
}
@@ -368,10 +368,10 @@ public final class ContextManager implements AutoCloseable {
Collection<ResourceHeldRule> staleResourceHeldRules = getStaleResourceHeldRules(databaseName);
staleResourceHeldRules.forEach(ResourceHeldRule::closeStaleResource);
SwitchingResource switchingResource =
- new ResourceSwitchManager().createByAlterDataSourceProps(metadataContexts.getMetadata().getDatabase(databaseName).getResourceMetaData(), dataSourcePropsMap);
- metadataContexts.getMetadata().getDatabases().putAll(renewDatabase(metadataContexts.getMetadata().getDatabase(databaseName), switchingResource));
- metadataContexts = createMetadataContexts(databaseName, switchingResource, null);
- metadataContexts.getMetadata().getDatabases().putAll(newShardingSphereDatabase(metadataContexts.getMetadata().getDatabase(databaseName)));
+ new ResourceSwitchManager().createByAlterDataSourceProps(metaDataContexts.getMetaData().getDatabase(databaseName).getResourceMetaData(), dataSourcePropsMap);
+ metaDataContexts.getMetaData().getDatabases().putAll(renewDatabase(metaDataContexts.getMetaData().getDatabase(databaseName), switchingResource));
+ metaDataContexts = createMetaDataContexts(databaseName, switchingResource, null);
+ metaDataContexts.getMetaData().getDatabases().putAll(newShardingSphereDatabase(metaDataContexts.getMetaData().getDatabase(databaseName)));
switchingResource.closeStaleDataSources();
} catch (final SQLException ex) {
log.error("Alter database: {} data source configuration failed", databaseName, ex);
@@ -391,9 +391,9 @@ public final class ContextManager implements AutoCloseable {
try {
Collection<ResourceHeldRule> staleResourceHeldRules = getStaleResourceHeldRules(databaseName);
staleResourceHeldRules.forEach(ResourceHeldRule::closeStaleResource);
- SwitchingResource switchingResource = new ResourceSwitchManager().create(metadataContexts.getMetadata().getDatabase(databaseName).getResourceMetaData(), dataSourcePropsMap);
- metadataContexts = createMetadataContexts(databaseName, switchingResource, ruleConfigs);
- metadataContexts.getMetadata().getDatabases().putAll(newShardingSphereDatabase(metadataContexts.getMetadata().getDatabase(databaseName)));
+ SwitchingResource switchingResource = new ResourceSwitchManager().create(metaDataContexts.getMetaData().getDatabase(databaseName).getResourceMetaData(), dataSourcePropsMap);
+ metaDataContexts = createMetaDataContexts(databaseName, switchingResource, ruleConfigs);
+ metaDataContexts.getMetaData().getDatabases().putAll(newShardingSphereDatabase(metaDataContexts.getMetaData().getDatabase(databaseName)));
switchingResource.closeStaleDataSources();
} catch (SQLException ex) {
log.error("Alter database: {} data source and rule configuration failed", databaseName, ex);
@@ -403,54 +403,54 @@ public final class ContextManager implements AutoCloseable {
@SuppressWarnings("rawtypes")
private Collection<ResourceHeldRule> getStaleResourceHeldRules(final String databaseName) {
Collection<ResourceHeldRule> result = new LinkedList<>();
- result.addAll(metadataContexts.getMetadata().getDatabase(databaseName).getRuleMetaData().findRules(ResourceHeldRule.class));
- result.addAll(metadataContexts.getMetadata().getGlobalRuleMetaData().findRules(ResourceHeldRule.class));
+ result.addAll(metaDataContexts.getMetaData().getDatabase(databaseName).getRuleMetaData().findRules(ResourceHeldRule.class));
+ result.addAll(metaDataContexts.getMetaData().getGlobalRuleMetaData().findRules(ResourceHeldRule.class));
return result;
}
- private MetadataContexts createMetadataContexts(final String databaseName, final SwitchingResource switchingResource, final Collection<RuleConfiguration> ruleConfigs) throws SQLException {
+ private MetaDataContexts createMetaDataContexts(final String databaseName, final SwitchingResource switchingResource, final Collection<RuleConfiguration> ruleConfigs) throws SQLException {
Map<String, ShardingSphereDatabase> changedDatabases = createChangedDatabases(databaseName, switchingResource, ruleConfigs);
- ConfigurationProperties props = metadataContexts.getMetadata().getProps();
- ShardingSphereRuleMetaData changedGlobalMetadata = new ShardingSphereRuleMetaData(
- GlobalRulesBuilder.buildRules(metadataContexts.getMetadata().getGlobalRuleMetaData().getConfigurations(), changedDatabases, instanceContext, props));
- return newMetadataContexts(new ShardingSphereMetaData(changedDatabases, changedGlobalMetadata, props));
+ ConfigurationProperties props = metaDataContexts.getMetaData().getProps();
+ ShardingSphereRuleMetaData changedGlobalMetaData = new ShardingSphereRuleMetaData(
+ GlobalRulesBuilder.buildRules(metaDataContexts.getMetaData().getGlobalRuleMetaData().getConfigurations(), changedDatabases, instanceContext, props));
+ return newMetaDataContexts(new ShardingSphereMetaData(changedDatabases, changedGlobalMetaData, props));
}
- private MetadataContexts createMetadataContexts(final String databaseName, final SwitchingResource switchingResource) throws SQLException {
- MetadataPersistService metadataPersistService = metadataContexts.getPersistService();
- Map<String, ShardingSphereDatabase> changedDatabases = createChangedDatabases(databaseName, switchingResource, metadataPersistService.getDatabaseRulePersistService().load(databaseName));
- ConfigurationProperties props = new ConfigurationProperties(metadataPersistService.getPropsService().load());
- ShardingSphereRuleMetaData changedGlobalMetadata = new ShardingSphereRuleMetaData(
- GlobalRulesBuilder.buildRules(metadataPersistService.getGlobalRuleService().load(), changedDatabases, instanceContext, props));
- return newMetadataContexts(new ShardingSphereMetaData(changedDatabases, changedGlobalMetadata, props));
+ private MetaDataContexts createMetaDataContexts(final String databaseName, final SwitchingResource switchingResource) throws SQLException {
+ MetaDataPersistService metaDataPersistService = metaDataContexts.getPersistService();
+ Map<String, ShardingSphereDatabase> changedDatabases = createChangedDatabases(databaseName, switchingResource, metaDataPersistService.getDatabaseRulePersistService().load(databaseName));
+ ConfigurationProperties props = new ConfigurationProperties(metaDataPersistService.getPropsService().load());
+ ShardingSphereRuleMetaData changedGlobalMetaData = new ShardingSphereRuleMetaData(
+ GlobalRulesBuilder.buildRules(metaDataPersistService.getGlobalRuleService().load(), changedDatabases, instanceContext, props));
+ return newMetaDataContexts(new ShardingSphereMetaData(changedDatabases, changedGlobalMetaData, props));
}
private Map<String, ShardingSphereDatabase> createChangedDatabases(final String databaseName,
final SwitchingResource switchingResource, final Collection<RuleConfiguration> ruleConfigs) throws SQLException {
if (null != switchingResource && !switchingResource.getNewDataSources().isEmpty()) {
- metadataContexts.getMetadata().getDatabase(databaseName).getResourceMetaData().getDataSources().putAll(switchingResource.getNewDataSources());
+ metaDataContexts.getMetaData().getDatabase(databaseName).getResourceMetaData().getDataSources().putAll(switchingResource.getNewDataSources());
}
Collection<RuleConfiguration> toBeCreatedRuleConfigs = null == ruleConfigs
- ? metadataContexts.getMetadata().getDatabase(databaseName).getRuleMetaData().getConfigurations()
+ ? metaDataContexts.getMetaData().getDatabase(databaseName).getRuleMetaData().getConfigurations()
: ruleConfigs;
DatabaseConfiguration toBeCreatedDatabaseConfig =
- new DataSourceProvidedDatabaseConfiguration(metadataContexts.getMetadata().getDatabase(databaseName).getResourceMetaData().getDataSources(), toBeCreatedRuleConfigs);
- ShardingSphereDatabase changedDatabase = ShardingSphereDatabasesFactory.create(metadataContexts.getMetadata().getActualDatabaseName(databaseName),
- toBeCreatedDatabaseConfig, metadataContexts.getMetadata().getProps(), instanceContext);
- Map<String, ShardingSphereDatabase> result = new LinkedHashMap<>(metadataContexts.getMetadata().getDatabases());
+ new DataSourceProvidedDatabaseConfiguration(metaDataContexts.getMetaData().getDatabase(databaseName).getResourceMetaData().getDataSources(), toBeCreatedRuleConfigs);
+ ShardingSphereDatabase changedDatabase = ShardingSphereDatabasesFactory.create(metaDataContexts.getMetaData().getActualDatabaseName(databaseName),
+ toBeCreatedDatabaseConfig, metaDataContexts.getMetaData().getProps(), instanceContext);
+ Map<String, ShardingSphereDatabase> result = new LinkedHashMap<>(metaDataContexts.getMetaData().getDatabases());
changedDatabase.getSchemas().putAll(newShardingSphereSchemas(changedDatabase));
result.put(databaseName.toLowerCase(), changedDatabase);
return result;
}
- private MetadataContexts newMetadataContexts(final ShardingSphereMetaData metadata) {
- return new MetadataContexts(metadataContexts.getPersistService(), metadata);
+ private MetaDataContexts newMetaDataContexts(final ShardingSphereMetaData metaData) {
+ return new MetaDataContexts(metaDataContexts.getPersistService(), metaData);
}
private Map<String, ShardingSphereSchema> newShardingSphereSchemas(final ShardingSphereDatabase database) {
Map<String, ShardingSphereSchema> result = new LinkedHashMap<>(database.getSchemas().size(), 1);
database.getSchemas().forEach((key, value) -> result.put(key, new ShardingSphereSchema(value.getTables(),
- metadataContexts.getPersistService().getDatabaseMetadataService().getViewMetaDataPersistService().load(database.getName(), key))));
+ metaDataContexts.getPersistService().getDatabaseMetaDataService().getViewMetaDataPersistService().load(database.getName(), key))));
return result;
}
@@ -458,7 +458,7 @@ public final class ContextManager implements AutoCloseable {
Map<String, ShardingSphereDatabase> result = new LinkedHashMap<>(1, 1);
result.put(originalDatabase.getName().toLowerCase(), new ShardingSphereDatabase(originalDatabase.getName(),
originalDatabase.getProtocolType(), originalDatabase.getResourceMetaData(), originalDatabase.getRuleMetaData(),
- metadataContexts.getPersistService().getDatabaseMetadataService().loadSchemas(originalDatabase.getName())));
+ metaDataContexts.getPersistService().getDatabaseMetaDataService().loadSchemas(originalDatabase.getName())));
return result;
}
@@ -472,13 +472,13 @@ public final class ContextManager implements AutoCloseable {
if (ruleConfigs.isEmpty()) {
return;
}
- Collection<ResourceHeldRule> staleResourceHeldRules = metadataContexts.getMetadata().getGlobalRuleMetaData().findRules(ResourceHeldRule.class);
+ Collection<ResourceHeldRule> staleResourceHeldRules = metaDataContexts.getMetaData().getGlobalRuleMetaData().findRules(ResourceHeldRule.class);
staleResourceHeldRules.forEach(ResourceHeldRule::closeStaleResource);
- ShardingSphereRuleMetaData toBeChangedGlobalRuleMetadata = new ShardingSphereRuleMetaData(
- GlobalRulesBuilder.buildRules(ruleConfigs, metadataContexts.getMetadata().getDatabases(), instanceContext, metadataContexts.getMetadata().getProps()));
- ShardingSphereMetaData toBeChangedMetadata = new ShardingSphereMetaData(
- metadataContexts.getMetadata().getDatabases(), toBeChangedGlobalRuleMetadata, metadataContexts.getMetadata().getProps());
- metadataContexts = newMetadataContexts(toBeChangedMetadata);
+ ShardingSphereRuleMetaData toBeChangedGlobalRuleMetaData = new ShardingSphereRuleMetaData(
+ GlobalRulesBuilder.buildRules(ruleConfigs, metaDataContexts.getMetaData().getDatabases(), instanceContext, metaDataContexts.getMetaData().getProps()));
+ ShardingSphereMetaData toBeChangedMetaData = new ShardingSphereMetaData(
+ metaDataContexts.getMetaData().getDatabases(), toBeChangedGlobalRuleMetaData, metaDataContexts.getMetaData().getProps());
+ metaDataContexts = newMetaDataContexts(toBeChangedMetaData);
}
/**
@@ -487,14 +487,14 @@ public final class ContextManager implements AutoCloseable {
* @param props properties to be altered
*/
public synchronized void alterProperties(final Properties props) {
- ShardingSphereMetaData toBeChangedMetadata = new ShardingSphereMetaData(
- metadataContexts.getMetadata().getDatabases(), metadataContexts.getMetadata().getGlobalRuleMetaData(), new ConfigurationProperties(props));
- metadataContexts = newMetadataContexts(toBeChangedMetadata);
+ ShardingSphereMetaData toBeChangedMetaData = new ShardingSphereMetaData(
+ metaDataContexts.getMetaData().getDatabases(), metaDataContexts.getMetaData().getGlobalRuleMetaData(), new ConfigurationProperties(props));
+ metaDataContexts = newMetaDataContexts(toBeChangedMetaData);
}
private void deletedSchemaNames(final String databaseName, final ShardingSphereDatabase reloadDatabase, final ShardingSphereDatabase currentDatabase) {
SchemaManager.getToBeDeletedSchemaNames(reloadDatabase.getSchemas(), currentDatabase.getSchemas()).keySet()
- .forEach(each -> metadataContexts.getPersistService().getDatabaseMetadataService().dropSchema(databaseName, each));
+ .forEach(each -> metaDataContexts.getPersistService().getDatabaseMetaDataService().dropSchema(databaseName, each));
}
/**
@@ -502,20 +502,20 @@ public final class ContextManager implements AutoCloseable {
*
* @param databaseName to be reloaded database name
*/
- public synchronized void reloadDatabaseMetadata(final String databaseName) {
+ public synchronized void reloadDatabaseMetaData(final String databaseName) {
try {
- ShardingSphereResourceMetaData currentResourceMetaData = metadataContexts.getMetadata().getDatabase(databaseName).getResourceMetaData();
- Map<String, DataSourceProperties> dataSourceProps = metadataContexts.getPersistService().getDataSourceService().load(databaseName);
+ ShardingSphereResourceMetaData currentResourceMetaData = metaDataContexts.getMetaData().getDatabase(databaseName).getResourceMetaData();
+ Map<String, DataSourceProperties> dataSourceProps = metaDataContexts.getPersistService().getDataSourceService().load(databaseName);
SwitchingResource switchingResource = new ResourceSwitchManager().createByAlterDataSourceProps(currentResourceMetaData, dataSourceProps);
- metadataContexts.getMetadata().getDatabases().putAll(renewDatabase(metadataContexts.getMetadata().getDatabase(databaseName), switchingResource));
- MetadataContexts reloadedMetadataContexts = createMetadataContexts(databaseName, switchingResource);
- deletedSchemaNames(databaseName, reloadedMetadataContexts.getMetadata().getDatabase(databaseName), metadataContexts.getMetadata().getDatabase(databaseName));
- metadataContexts = reloadedMetadataContexts;
- metadataContexts.getMetadata().getDatabases().values().forEach(
- each -> each.getSchemas().forEach((schemaName, schema) -> metadataContexts.getPersistService().getDatabaseMetadataService().compareAndPersist(each.getName(), schemaName, schema)));
+ metaDataContexts.getMetaData().getDatabases().putAll(renewDatabase(metaDataContexts.getMetaData().getDatabase(databaseName), switchingResource));
+ MetaDataContexts reloadedMetaDataContexts = createMetaDataContexts(databaseName, switchingResource);
+ deletedSchemaNames(databaseName, reloadedMetaDataContexts.getMetaData().getDatabase(databaseName), metaDataContexts.getMetaData().getDatabase(databaseName));
+ metaDataContexts = reloadedMetaDataContexts;
+ metaDataContexts.getMetaData().getDatabases().values().forEach(
+ each -> each.getSchemas().forEach((schemaName, schema) -> metaDataContexts.getPersistService().getDatabaseMetaDataService().compareAndPersist(each.getName(), schemaName, schema)));
switchingResource.closeStaleDataSources();
} catch (final SQLException ex) {
- log.error("Reload database Metadata: {} failed", databaseName, ex);
+ log.error("Reload database meta data: {} failed", databaseName, ex);
}
}
@@ -530,25 +530,25 @@ public final class ContextManager implements AutoCloseable {
try {
ShardingSphereSchema reloadedSchema = loadSchema(databaseName, schemaName, dataSourceName);
if (reloadedSchema.getTables().isEmpty()) {
- metadataContexts.getMetadata().getDatabase(databaseName).removeSchema(schemaName);
- metadataContexts.getPersistService().getDatabaseMetadataService().dropSchema(metadataContexts.getMetadata().getActualDatabaseName(databaseName), schemaName);
+ metaDataContexts.getMetaData().getDatabase(databaseName).removeSchema(schemaName);
+ metaDataContexts.getPersistService().getDatabaseMetaDataService().dropSchema(metaDataContexts.getMetaData().getActualDatabaseName(databaseName), schemaName);
} else {
- metadataContexts.getMetadata().getDatabase(databaseName).putSchema(schemaName, reloadedSchema);
- metadataContexts.getPersistService().getDatabaseMetadataService().compareAndPersist(metadataContexts.getMetadata().getActualDatabaseName(databaseName), schemaName, reloadedSchema);
+ metaDataContexts.getMetaData().getDatabase(databaseName).putSchema(schemaName, reloadedSchema);
+ metaDataContexts.getPersistService().getDatabaseMetaDataService().compareAndPersist(metaDataContexts.getMetaData().getActualDatabaseName(databaseName), schemaName, reloadedSchema);
}
} catch (final SQLException ex) {
- log.error("Reload Metadata of database: {} schema: {} with data source: {} failed", databaseName, schemaName, dataSourceName, ex);
+ log.error("Reload meta data of database: {} schema: {} with data source: {} failed", databaseName, schemaName, dataSourceName, ex);
}
}
private ShardingSphereSchema loadSchema(final String databaseName, final String schemaName, final String dataSourceName) throws SQLException {
- ShardingSphereDatabase database = metadataContexts.getMetadata().getDatabase(databaseName);
+ ShardingSphereDatabase database = metaDataContexts.getMetaData().getDatabase(databaseName);
database.reloadRules(MutableDataNodeRule.class);
GenericSchemaBuilderMaterial material = new GenericSchemaBuilderMaterial(database.getProtocolType(), database.getResourceMetaData().getStorageTypes(),
Collections.singletonMap(dataSourceName, database.getResourceMetaData().getDataSources().get(dataSourceName)),
- database.getRuleMetaData().getRules(), metadataContexts.getMetadata().getProps(), schemaName);
+ database.getRuleMetaData().getRules(), metaDataContexts.getMetaData().getProps(), schemaName);
ShardingSphereSchema result = GenericSchemaBuilder.build(material).get(schemaName);
- result.getViews().putAll(metadataContexts.getPersistService().getDatabaseMetadataService().getViewMetaDataPersistService().load(database.getName(), schemaName));
+ result.getViews().putAll(metaDataContexts.getPersistService().getDatabaseMetaDataService().getViewMetaDataPersistService().load(database.getName(), schemaName));
return result;
}
@@ -560,11 +560,11 @@ public final class ContextManager implements AutoCloseable {
* @param tableName to be reloaded table name
*/
public void reloadTable(final String databaseName, final String schemaName, final String tableName) {
- Map<String, DataSource> dataSourceMap = metadataContexts.getMetadata().getDatabase(databaseName).getResourceMetaData().getDataSources();
+ Map<String, DataSource> dataSourceMap = metaDataContexts.getMetaData().getDatabase(databaseName).getResourceMetaData().getDataSources();
try {
reloadTable(databaseName, schemaName, tableName, dataSourceMap);
} catch (final SQLException ex) {
- log.error("Reload table: {} Metadata of database: {} schema: {} failed", tableName, databaseName, schemaName, ex);
+ log.error("Reload table: {} meta data of database: {} schema: {} failed", tableName, databaseName, schemaName, ex);
}
}
@@ -578,25 +578,25 @@ public final class ContextManager implements AutoCloseable {
*/
public void reloadTable(final String databaseName, final String schemaName, final String dataSourceName, final String tableName) {
Map<String, DataSource> dataSourceMap = Collections.singletonMap(
- dataSourceName, metadataContexts.getMetadata().getDatabase(databaseName).getResourceMetaData().getDataSources().get(dataSourceName));
+ dataSourceName, metaDataContexts.getMetaData().getDatabase(databaseName).getResourceMetaData().getDataSources().get(dataSourceName));
try {
reloadTable(databaseName, schemaName, tableName, dataSourceMap);
} catch (final SQLException ex) {
- log.error("Reload table: {} Metadata of database: {} schema: {} with data source: {} failed", tableName, databaseName, schemaName, dataSourceName, ex);
+ log.error("Reload table: {} meta data of database: {} schema: {} with data source: {} failed", tableName, databaseName, schemaName, dataSourceName, ex);
}
}
private synchronized void reloadTable(final String databaseName, final String schemaName, final String tableName, final Map<String, DataSource> dataSourceMap) throws SQLException {
- ShardingSphereDatabase database = metadataContexts.getMetadata().getDatabase(databaseName);
+ ShardingSphereDatabase database = metaDataContexts.getMetaData().getDatabase(databaseName);
GenericSchemaBuilderMaterial material = new GenericSchemaBuilderMaterial(database.getProtocolType(),
- database.getResourceMetaData().getStorageTypes(), dataSourceMap, database.getRuleMetaData().getRules(), metadataContexts.getMetadata().getProps(), schemaName);
+ database.getResourceMetaData().getStorageTypes(), dataSourceMap, database.getRuleMetaData().getRules(), metaDataContexts.getMetaData().getProps(), schemaName);
ShardingSphereSchema schema = GenericSchemaBuilder.build(Collections.singletonList(tableName), material).getOrDefault(schemaName, new ShardingSphereSchema());
if (schema.containsTable(tableName)) {
alterTable(databaseName, schemaName, schema.getTable(tableName));
} else {
dropTable(databaseName, schemaName, tableName);
}
- metadataContexts.getPersistService().getDatabaseMetadataService().compareAndPersist(database.getName(), schemaName, database.getSchema(schemaName));
+ metaDataContexts.getPersistService().getDatabaseMetaDataService().compareAndPersist(database.getName(), schemaName, database.getSchema(schemaName));
}
/**
@@ -605,10 +605,10 @@ public final class ContextManager implements AutoCloseable {
* @param databaseName database name
*/
public synchronized void addShardingSphereDatabaseData(final String databaseName) {
- if (metadataContexts.getShardingSphereData().getDatabaseData().containsKey(databaseName)) {
+ if (metaDataContexts.getShardingSphereData().getDatabaseData().containsKey(databaseName)) {
return;
}
- metadataContexts.getShardingSphereData().getDatabaseData().put(databaseName, new ShardingSphereDatabaseData());
+ metaDataContexts.getShardingSphereData().getDatabaseData().put(databaseName, new ShardingSphereDatabaseData());
}
/**
@@ -616,10 +616,10 @@ public final class ContextManager implements AutoCloseable {
* @param databaseName database name
*/
public synchronized void dropShardingSphereDatabaseData(final String databaseName) {
- if (!metadataContexts.getShardingSphereData().getDatabaseData().containsKey(databaseName.toLowerCase())) {
+ if (!metaDataContexts.getShardingSphereData().getDatabaseData().containsKey(databaseName.toLowerCase())) {
return;
}
- metadataContexts.getShardingSphereData().getDatabaseData().remove(databaseName);
+ metaDataContexts.getShardingSphereData().getDatabaseData().remove(databaseName);
}
/**
@@ -629,10 +629,10 @@ public final class ContextManager implements AutoCloseable {
* @param schemaName schema name
*/
public synchronized void addShardingSphereSchemaData(final String databaseName, final String schemaName) {
- if (metadataContexts.getShardingSphereData().getDatabaseData().get(databaseName).getSchemaData().containsKey(schemaName)) {
+ if (metaDataContexts.getShardingSphereData().getDatabaseData().get(databaseName).getSchemaData().containsKey(schemaName)) {
return;
}
- metadataContexts.getShardingSphereData().getDatabaseData().get(databaseName).getSchemaData().put(schemaName, new ShardingSphereSchemaData());
+ metaDataContexts.getShardingSphereData().getDatabaseData().get(databaseName).getSchemaData().put(schemaName, new ShardingSphereSchemaData());
}
/**
@@ -642,7 +642,7 @@ public final class ContextManager implements AutoCloseable {
* @param schemaName schema name
*/
public synchronized void dropShardingSphereSchemaData(final String databaseName, final String schemaName) {
- ShardingSphereDatabaseData databaseData = metadataContexts.getShardingSphereData().getDatabaseData().get(databaseName);
+ ShardingSphereDatabaseData databaseData = metaDataContexts.getShardingSphereData().getDatabaseData().get(databaseName);
if (null == databaseData || !databaseData.getSchemaData().containsKey(schemaName)) {
return;
}
@@ -657,14 +657,14 @@ public final class ContextManager implements AutoCloseable {
* @param tableName table name
*/
public synchronized void addShardingSphereTableData(final String databaseName, final String schemaName, final String tableName) {
- if (!metadataContexts.getShardingSphereData().getDatabaseData().containsKey(databaseName)
- || !metadataContexts.getShardingSphereData().getDatabaseData().get(databaseName).getSchemaData().containsKey(schemaName)) {
+ if (!metaDataContexts.getShardingSphereData().getDatabaseData().containsKey(databaseName)
+ || !metaDataContexts.getShardingSphereData().getDatabaseData().get(databaseName).getSchemaData().containsKey(schemaName)) {
return;
}
- if (metadataContexts.getShardingSphereData().getDatabaseData().get(databaseName).getSchemaData().get(schemaName).getTableData().containsKey(tableName)) {
+ if (metaDataContexts.getShardingSphereData().getDatabaseData().get(databaseName).getSchemaData().get(schemaName).getTableData().containsKey(tableName)) {
return;
}
- ShardingSphereDatabaseData database = metadataContexts.getShardingSphereData().getDatabaseData().get(databaseName);
+ ShardingSphereDatabaseData database = metaDataContexts.getShardingSphereData().getDatabaseData().get(databaseName);
database.getSchemaData().get(schemaName).getTableData().put(tableName, new ShardingSphereTableData(tableName));
}
@@ -676,11 +676,11 @@ public final class ContextManager implements AutoCloseable {
* @param tableName table name
*/
public synchronized void dropShardingSphereTableData(final String databaseName, final String schemaName, final String tableName) {
- if (!metadataContexts.getShardingSphereData().getDatabaseData().containsKey(databaseName)
- || !metadataContexts.getShardingSphereData().getDatabaseData().get(databaseName).getSchemaData().containsKey(schemaName)) {
+ if (!metaDataContexts.getShardingSphereData().getDatabaseData().containsKey(databaseName)
+ || !metaDataContexts.getShardingSphereData().getDatabaseData().get(databaseName).getSchemaData().containsKey(schemaName)) {
return;
}
- metadataContexts.getShardingSphereData().getDatabaseData().get(databaseName).getSchemaData().get(schemaName).getTableData().remove(tableName);
+ metaDataContexts.getShardingSphereData().getDatabaseData().get(databaseName).getSchemaData().get(schemaName).getTableData().remove(tableName);
}
/**
@@ -692,17 +692,17 @@ public final class ContextManager implements AutoCloseable {
* @param yamlRowData yaml row data
*/
public synchronized void alterShardingSphereRowData(final String databaseName, final String schemaName, final String tableName, final YamlShardingSphereRowData yamlRowData) {
- if (!metadataContexts.getShardingSphereData().getDatabaseData().containsKey(databaseName)
- || !metadataContexts.getShardingSphereData().getDatabaseData().get(databaseName).getSchemaData().containsKey(schemaName)
- || !metadataContexts.getShardingSphereData().getDatabaseData().get(databaseName).getSchemaData().get(schemaName).getTableData().containsKey(tableName)) {
+ if (!metaDataContexts.getShardingSphereData().getDatabaseData().containsKey(databaseName)
+ || !metaDataContexts.getShardingSphereData().getDatabaseData().get(databaseName).getSchemaData().containsKey(schemaName)
+ || !metaDataContexts.getShardingSphereData().getDatabaseData().get(databaseName).getSchemaData().get(schemaName).getTableData().containsKey(tableName)) {
return;
}
- if (!metadataContexts.getMetadata().containsDatabase(databaseName) || !metadataContexts.getMetadata().getDatabase(databaseName).containsSchema(schemaName)
- || !metadataContexts.getMetadata().getDatabase(databaseName).getSchema(schemaName).containsTable(tableName)) {
+ if (!metaDataContexts.getMetaData().containsDatabase(databaseName) || !metaDataContexts.getMetaData().getDatabase(databaseName).containsSchema(schemaName)
+ || !metaDataContexts.getMetaData().getDatabase(databaseName).getSchema(schemaName).containsTable(tableName)) {
return;
}
- ShardingSphereTableData tableData = metadataContexts.getShardingSphereData().getDatabaseData().get(databaseName).getSchemaData().get(schemaName).getTableData().get(tableName);
- List<ShardingSphereColumn> columns = new ArrayList<>(metadataContexts.getMetadata().getDatabase(databaseName).getSchema(schemaName).getTable(tableName).getColumns().values());
+ ShardingSphereTableData tableData = metaDataContexts.getShardingSphereData().getDatabaseData().get(databaseName).getSchemaData().get(schemaName).getTableData().get(tableName);
+ List<ShardingSphereColumn> columns = new ArrayList<>(metaDataContexts.getMetaData().getDatabase(databaseName).getSchema(schemaName).getTable(tableName).getColumns().values());
ShardingSphereRowData rowData = new YamlShardingSphereRowDataSwapper(columns).swapToObject(yamlRowData);
tableData.getRows().add(rowData);
}
@@ -716,18 +716,18 @@ public final class ContextManager implements AutoCloseable {
* @param uniqueKey row uniqueKey
*/
public synchronized void deleteShardingSphereRowData(final String databaseName, final String schemaName, final String tableName, final String uniqueKey) {
- if (!metadataContexts.getShardingSphereData().getDatabaseData().containsKey(databaseName)
- || !metadataContexts.getShardingSphereData().getDatabaseData().get(databaseName).getSchemaData().containsKey(schemaName)
- || !metadataContexts.getShardingSphereData().getDatabaseData().get(databaseName).getSchemaData().get(schemaName).getTableData().containsKey(tableName)) {
+ if (!metaDataContexts.getShardingSphereData().getDatabaseData().containsKey(databaseName)
+ || !metaDataContexts.getShardingSphereData().getDatabaseData().get(databaseName).getSchemaData().containsKey(schemaName)
+ || !metaDataContexts.getShardingSphereData().getDatabaseData().get(databaseName).getSchemaData().get(schemaName).getTableData().containsKey(tableName)) {
return;
}
- ShardingSphereTableData tableData = metadataContexts.getShardingSphereData().getDatabaseData().get(databaseName).getSchemaData().get(schemaName).getTableData().get(tableName);
+ ShardingSphereTableData tableData = metaDataContexts.getShardingSphereData().getDatabaseData().get(databaseName).getSchemaData().get(schemaName).getTableData().get(tableName);
tableData.getRows().removeIf(each -> uniqueKey.equals(each.getUniqueKey()));
}
@Override
public void close() {
executorEngine.close();
- metadataContexts.close();
+ metaDataContexts.close();
}
}
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/ResourceSwitchManager.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/ResourceSwitchManager.java
index 4610b0e1654..8b26db6c668 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/ResourceSwitchManager.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/ResourceSwitchManager.java
@@ -37,7 +37,7 @@ public final class ResourceSwitchManager {
/**
* Create switching resource.
*
- * @param resourceMetaData resource Metadata
+ * @param resourceMetaData resource meta data
* @param toBeChangedDataSourceProps to be changed data source properties map
* @return created switching resource
*/
@@ -48,7 +48,7 @@ public final class ResourceSwitchManager {
/**
* Create switching resource by drop resource.
*
- * @param resourceMetaData resource Metadata
+ * @param resourceMetaData resource meta data
* @param toBeDeletedDataSourceProps to be deleted data source properties map
* @return created switching resource
*/
@@ -59,7 +59,7 @@ public final class ResourceSwitchManager {
/**
* Create switching resource by alter data source props.
*
- * @param resourceMetaData resource Metadata
+ * @param resourceMetaData resource meta data
* @param toBeChangedDataSourceProps to be changed data source properties map
* @return created switching resource
*/
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetadataContexts.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java
similarity index 83%
rename from mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetadataContexts.java
rename to mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java
index 956b009b29b..b9ad35109cc 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetadataContexts.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java
@@ -25,37 +25,37 @@ import org.apache.shardingsphere.infra.metadata.data.ShardingSphereSchemaData;
import org.apache.shardingsphere.infra.metadata.data.ShardingSphereTableData;
import org.apache.shardingsphere.infra.metadata.data.builder.ShardingSphereDataBuilderFactory;
import org.apache.shardingsphere.infra.rule.identifier.type.ResourceHeldRule;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import java.util.Map.Entry;
import java.util.Optional;
/**
- * Metadata contexts.
+ * Meta data contexts.
*/
@Getter
-public final class MetadataContexts implements AutoCloseable {
+public final class MetaDataContexts implements AutoCloseable {
- private final MetadataPersistService persistService;
+ private final MetaDataPersistService persistService;
- private final ShardingSphereMetaData metadata;
+ private final ShardingSphereMetaData metaData;
private final ShardingSphereData shardingSphereData;
- public MetadataContexts(final MetadataPersistService persistService, final ShardingSphereMetaData metadata) {
+ public MetaDataContexts(final MetaDataPersistService persistService, final ShardingSphereMetaData metaData) {
this.persistService = persistService;
- this.metadata = metadata;
- this.shardingSphereData = initShardingSphereData(persistService, metadata);
+ this.metaData = metaData;
+ this.shardingSphereData = initShardingSphereData(persistService, metaData);
}
- private ShardingSphereData initShardingSphereData(final MetadataPersistService persistService, final ShardingSphereMetaData metadata) {
- if (metadata.getDatabases().isEmpty()) {
+ private ShardingSphereData initShardingSphereData(final MetaDataPersistService persistService, final ShardingSphereMetaData metaData) {
+ if (metaData.getDatabases().isEmpty()) {
return new ShardingSphereData();
}
- ShardingSphereData result = Optional.ofNullable(metadata.getDatabases().values().iterator().next().getProtocolType())
- .flatMap(protocolType -> ShardingSphereDataBuilderFactory.getInstance(protocolType).map(builder -> builder.build(metadata))).orElseGet(ShardingSphereData::new);
+ ShardingSphereData result = Optional.ofNullable(metaData.getDatabases().values().iterator().next().getProtocolType())
+ .flatMap(protocolType -> ShardingSphereDataBuilderFactory.getInstance(protocolType).map(builder -> builder.build(metaData))).orElseGet(ShardingSphereData::new);
Optional<ShardingSphereData> loadedShardingSphereData = Optional.ofNullable(persistService.getShardingSphereDataPersistService())
- .flatMap(shardingSphereDataPersistService -> shardingSphereDataPersistService.load(metadata));
+ .flatMap(shardingSphereDataPersistService -> shardingSphereDataPersistService.load(metaData));
loadedShardingSphereData.ifPresent(sphereData -> useLoadedToReplaceInit(result, sphereData));
return result;
}
@@ -87,7 +87,7 @@ public final class MetadataContexts implements AutoCloseable {
@Override
public void close() {
persistService.getRepository().close();
- metadata.getGlobalRuleMetaData().findRules(ResourceHeldRule.class).forEach(ResourceHeldRule::closeStaleResource);
- metadata.getDatabases().values().forEach(each -> each.getRuleMetaData().findRules(ResourceHeldRule.class).forEach(ResourceHeldRule::closeStaleResource));
+ metaData.getGlobalRuleMetaData().findRules(ResourceHeldRule.class).forEach(ResourceHeldRule::closeStaleResource);
+ metaData.getDatabases().values().forEach(each -> each.getRuleMetaData().findRules(ResourceHeldRule.class).forEach(ResourceHeldRule::closeStaleResource));
}
}
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetadataContextsFactory.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
similarity index 91%
rename from mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetadataContextsFactory.java
rename to mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
index f079f634191..6c604d72b0d 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetadataContextsFactory.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
@@ -36,7 +36,7 @@ import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRule
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.rule.builder.global.GlobalRulesBuilder;
import org.apache.shardingsphere.mode.manager.ContextManagerBuilderParameter;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.metadata.storage.StorageNodeDataSource;
import javax.sql.DataSource;
@@ -50,39 +50,39 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
/**
- * Metadata contexts.
+ * Meta data contexts.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class MetadataContextsFactory {
+public final class MetaDataContextsFactory {
/**
- * Create Metadata contexts.
+ * Create meta data contexts.
*
* @param persistService persist service
* @param param context manager builder parameter
* @param instanceContext instance context
- * @return Metadata contexts
+ * @return meta data contexts
* @throws SQLException SQL exception
*/
- public static MetadataContexts create(final MetadataPersistService persistService, final ContextManagerBuilderParameter param, final InstanceContext instanceContext) throws SQLException {
+ public static MetaDataContexts create(final MetaDataPersistService persistService, final ContextManagerBuilderParameter param, final InstanceContext instanceContext) throws SQLException {
return create(persistService, param, instanceContext, Collections.emptyMap());
}
/**
- * Create Metadata contexts.
+ * Create meta data contexts.
*
* @param persistService persist service
* @param param context manager builder parameter
* @param instanceContext instance context
* @param storageNodes storage nodes
- * @return Metadata contexts
+ * @return meta data contexts
* @throws SQLException SQL exception
*/
- public static MetadataContexts create(final MetadataPersistService persistService, final ContextManagerBuilderParameter param,
+ public static MetaDataContexts create(final MetaDataPersistService persistService, final ContextManagerBuilderParameter param,
final InstanceContext instanceContext, final Map<String, StorageNodeDataSource> storageNodes) throws SQLException {
Collection<String> databaseNames = instanceContext.getInstance().getMetaData() instanceof JDBCInstanceMetaData
? param.getDatabaseConfigs().keySet()
- : persistService.getDatabaseMetadataService().loadAllDatabaseNames();
+ : persistService.getDatabaseMetaDataService().loadAllDatabaseNames();
Map<String, DatabaseConfiguration> effectiveDatabaseConfigs = createEffectiveDatabaseConfigurations(databaseNames, param.getDatabaseConfigs(), persistService);
checkDataSourceStates(effectiveDatabaseConfigs, storageNodes, param.isForce());
Collection<RuleConfiguration> globalRuleConfigs = persistService.getGlobalRuleService().load();
@@ -90,17 +90,17 @@ public final class MetadataContextsFactory {
Map<String, ShardingSphereDatabase> databases = ShardingSphereDatabasesFactory.create(effectiveDatabaseConfigs, props, instanceContext);
databases.putAll(reloadDatabases(databases, persistService));
ShardingSphereRuleMetaData globalMetaData = new ShardingSphereRuleMetaData(GlobalRulesBuilder.buildRules(globalRuleConfigs, databases, instanceContext, props));
- return new MetadataContexts(persistService, new ShardingSphereMetaData(databases, globalMetaData, props));
+ return new MetaDataContexts(persistService, new ShardingSphereMetaData(databases, globalMetaData, props));
}
private static Map<String, DatabaseConfiguration> createEffectiveDatabaseConfigurations(final Collection<String> databaseNames,
- final Map<String, DatabaseConfiguration> databaseConfigs, final MetadataPersistService persistService) {
+ final Map<String, DatabaseConfiguration> databaseConfigs, final MetaDataPersistService persistService) {
return databaseNames.stream().collect(
Collectors.toMap(each -> each, each -> createEffectiveDatabaseConfiguration(each, databaseConfigs, persistService), (a, b) -> b, () -> new HashMap<>(databaseNames.size(), 1)));
}
private static DatabaseConfiguration createEffectiveDatabaseConfiguration(final String databaseName,
- final Map<String, DatabaseConfiguration> databaseConfigs, final MetadataPersistService persistService) {
+ final Map<String, DatabaseConfiguration> databaseConfigs, final MetaDataPersistService persistService) {
Map<String, DataSource> effectiveDataSources = persistService.getEffectiveDataSources(databaseName, databaseConfigs);
Collection<RuleConfiguration> databaseRuleConfigs = persistService.getDatabaseRulePersistService().load(databaseName);
return new DataSourceProvidedDatabaseConfiguration(effectiveDataSources, databaseRuleConfigs);
@@ -127,10 +127,10 @@ public final class MetadataContextsFactory {
return result;
}
- private static Map<String, ShardingSphereDatabase> reloadDatabases(final Map<String, ShardingSphereDatabase> databases, final MetadataPersistService persistService) {
+ private static Map<String, ShardingSphereDatabase> reloadDatabases(final Map<String, ShardingSphereDatabase> databases, final MetaDataPersistService persistService) {
Map<String, ShardingSphereDatabase> result = new ConcurrentHashMap<>(databases.size(), 1);
databases.forEach((key, value) -> {
- Map<String, ShardingSphereSchema> schemas = persistService.getDatabaseMetadataService().loadSchemas(key);
+ Map<String, ShardingSphereSchema> schemas = persistService.getDatabaseMetaDataService().loadSchemas(key);
result.put(key.toLowerCase(), new ShardingSphereDatabase(value.getName(),
value.getProtocolType(), value.getResourceMetaData(), value.getRuleMetaData(), schemas.isEmpty() ? value.getSchemas() : schemas));
});
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetadataPersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java
similarity index 92%
rename from mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetadataPersistService.java
rename to mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java
index c2af8080396..87fae7bef6a 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetadataPersistService.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java
@@ -25,8 +25,8 @@ import org.apache.shardingsphere.infra.datasource.pool.destroyer.DataSourcePoolD
import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
import org.apache.shardingsphere.infra.datasource.props.DataSourcePropertiesCreator;
import org.apache.shardingsphere.mode.metadata.persist.data.ShardingSphereDataPersistService;
-import org.apache.shardingsphere.mode.metadata.persist.service.DatabaseMetadataPersistService;
-import org.apache.shardingsphere.mode.metadata.persist.service.MetadataVersionPersistService;
+import org.apache.shardingsphere.mode.metadata.persist.service.DatabaseMetaDataPersistService;
+import org.apache.shardingsphere.mode.metadata.persist.service.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.metadata.persist.service.config.database.DataSourcePersistService;
import org.apache.shardingsphere.mode.metadata.persist.service.config.database.DatabaseRulePersistService;
import org.apache.shardingsphere.mode.metadata.persist.service.config.global.GlobalRulePersistService;
@@ -41,16 +41,16 @@ import java.util.Map.Entry;
import java.util.Properties;
/**
- * Metadata persist service.
+ * Meta data persist service.
*/
@Getter
-public final class MetadataPersistService {
+public final class MetaDataPersistService {
private final PersistRepository repository;
private final DataSourcePersistService dataSourceService;
- private final DatabaseMetadataPersistService databaseMetadataService;
+ private final DatabaseMetaDataPersistService databaseMetaDataService;
private final DatabaseRulePersistService databaseRulePersistService;
@@ -58,18 +58,18 @@ public final class MetadataPersistService {
private final PropertiesPersistService propsService;
- private final MetadataVersionPersistService metadataVersionPersistService;
+ private final MetaDataVersionPersistService metaDataVersionPersistService;
private final ShardingSphereDataPersistService shardingSphereDataPersistService;
- public MetadataPersistService(final PersistRepository repository) {
+ public MetaDataPersistService(final PersistRepository repository) {
this.repository = repository;
dataSourceService = new DataSourcePersistService(repository);
- databaseMetadataService = new DatabaseMetadataPersistService(repository);
+ databaseMetaDataService = new DatabaseMetaDataPersistService(repository);
databaseRulePersistService = new DatabaseRulePersistService(repository);
globalRuleService = new GlobalRulePersistService(repository);
propsService = new PropertiesPersistService(repository);
- metadataVersionPersistService = new MetadataVersionPersistService(repository);
+ metaDataVersionPersistService = new MetaDataVersionPersistService(repository);
shardingSphereDataPersistService = new ShardingSphereDataPersistService(repository);
}
@@ -89,7 +89,7 @@ public final class MetadataPersistService {
Map<String, DataSourceProperties> dataSourcePropertiesMap = getDataSourcePropertiesMap(entry.getValue().getDataSources());
Collection<RuleConfiguration> ruleConfigurations = entry.getValue().getRuleConfigurations();
if (dataSourcePropertiesMap.isEmpty() && ruleConfigurations.isEmpty()) {
- databaseMetadataService.addDatabase(databaseName);
+ databaseMetaDataService.addDatabase(databaseName);
} else {
dataSourceService.conditionalPersist(databaseName, getDataSourcePropertiesMap(entry.getValue().getDataSources()));
databaseRulePersistService.conditionalPersist(databaseName, entry.getValue().getRuleConfigurations());
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/data/ShardingSphereDataPersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/data/ShardingSphereDataPersistService.java
index a81019e4097..5829f1e97d4 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/data/ShardingSphereDataPersistService.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/data/ShardingSphereDataPersistService.java
@@ -53,18 +53,18 @@ public final class ShardingSphereDataPersistService {
/**
* Load.
*
- * @param metadata Metadata
+ * @param metaData metadata
* @return ShardingSphere data
*/
- public Optional<ShardingSphereData> load(final ShardingSphereMetaData metadata) {
+ public Optional<ShardingSphereData> load(final ShardingSphereMetaData metaData) {
Collection<String> databaseNames = repository.getChildrenKeys(ShardingSphereDataNode.getShardingSphereDataNodePath());
if (databaseNames.isEmpty()) {
return Optional.empty();
}
ShardingSphereData result = new ShardingSphereData();
for (String each : databaseNames) {
- if (metadata.containsDatabase(each)) {
- ShardingSphereDatabaseData databaseData = loadDatabaseData(each, metadata.getDatabase(each));
+ if (metaData.containsDatabase(each)) {
+ ShardingSphereDatabaseData databaseData = loadDatabaseData(each, metaData.getDatabase(each));
result.getDatabaseData().put(each, databaseData);
}
}
@@ -116,7 +116,6 @@ public final class ShardingSphereDataPersistService {
/**
* Persist.
- *
* @param databaseName database name
* @param schemaName schema name
* @param schemaData schema data
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/node/DatabaseMetadataNode.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/node/DatabaseMetaDataNode.java
similarity index 75%
rename from mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/node/DatabaseMetadataNode.java
rename to mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/node/DatabaseMetaDataNode.java
index 3220e44b99b..bbaf9d3364a 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/node/DatabaseMetadataNode.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/node/DatabaseMetaDataNode.java
@@ -25,10 +25,10 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- * Database Metadata node.
+ * Database meta data node.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class DatabaseMetadataNode {
+public final class DatabaseMetaDataNode {
private static final String ROOT_NODE = "metadata";
@@ -47,22 +47,22 @@ public final class DatabaseMetadataNode {
private static final String VERSIONS = "versions";
/**
- * Get Metadata data source path.
+ * Get meta data data source path.
*
* @param databaseName database name
* @param version data source version
* @return data source path
*/
- public static String getMetadataDataSourcePath(final String databaseName, final String version) {
- return String.join("/", getFullMetadataPath(databaseName, VERSIONS), version, DATA_SOURCE_NODE);
+ public static String getMetaDataDataSourcePath(final String databaseName, final String version) {
+ return String.join("/", getFullMetaDataPath(databaseName, VERSIONS), version, DATA_SOURCE_NODE);
}
/**
- * Get Metadata node path.
+ * Get meta data node path.
*
- * @return Metadata node path
+ * @return meta data node path
*/
- public static String getMetadataNodePath() {
+ public static String getMetaDataNodePath() {
return String.join("/", "", ROOT_NODE);
}
@@ -73,7 +73,7 @@ public final class DatabaseMetadataNode {
* @return database name path
*/
public static String getDatabaseNamePath(final String databaseName) {
- return String.join("/", getMetadataNodePath(), databaseName);
+ return String.join("/", getMetaDataNodePath(), databaseName);
}
/**
@@ -84,29 +84,29 @@ public final class DatabaseMetadataNode {
* @return rule path
*/
public static String getRulePath(final String databaseName, final String version) {
- return String.join("/", getFullMetadataPath(databaseName, VERSIONS), version, RULE_NODE);
+ return String.join("/", getFullMetaDataPath(databaseName, VERSIONS), version, RULE_NODE);
}
/**
- * Get Metadata tables path.
+ * Get meta data tables path.
*
* @param databaseName database name
* @param schemaName schema name
* @return tables path
*/
- public static String getMetadataTablesPath(final String databaseName, final String schemaName) {
- return String.join("/", getMetadataSchemaPath(databaseName, schemaName), TABLES_NODE);
+ public static String getMetaDataTablesPath(final String databaseName, final String schemaName) {
+ return String.join("/", getMetaDataSchemaPath(databaseName, schemaName), TABLES_NODE);
}
/**
- * Get Metadata views path.
+ * Get meta data views path.
*
* @param databaseName database name
* @param schemaName schema name
* @return views path
*/
- public static String getMetadataViewsPath(final String databaseName, final String schemaName) {
- return String.join("/", getMetadataSchemaPath(databaseName, schemaName), VIEWS_NODE);
+ public static String getMetaDataViewsPath(final String databaseName, final String schemaName) {
+ return String.join("/", getMetaDataSchemaPath(databaseName, schemaName), VIEWS_NODE);
}
/**
@@ -116,45 +116,45 @@ public final class DatabaseMetadataNode {
* @param schemaName schema name
* @return tables path
*/
- public static String getMetadataSchemaPath(final String databaseName, final String schemaName) {
- return String.join("/", getMetadataSchemasPath(databaseName), schemaName);
+ public static String getMetaDataSchemaPath(final String databaseName, final String schemaName) {
+ return String.join("/", getMetaDataSchemasPath(databaseName), schemaName);
}
/**
- * Get Metadata schemas path.
+ * Get meta data schemas path.
*
* @param databaseName database name
* @return schemas path
*/
- public static String getMetadataSchemasPath(final String databaseName) {
+ public static String getMetaDataSchemasPath(final String databaseName) {
return String.join("/", getDatabaseNamePath(databaseName), SCHEMAS_NODE);
}
/**
- * Get table Metadata path.
+ * Get table meta data path.
*
* @param databaseName database name
* @param schemaName schema name
* @param table table name
- * @return table Metadata path
+ * @return table meta data path
*/
- public static String getTableMetadataPath(final String databaseName, final String schemaName, final String table) {
- return String.join("/", getMetadataTablesPath(databaseName, schemaName), table);
+ public static String getTableMetaDataPath(final String databaseName, final String schemaName, final String table) {
+ return String.join("/", getMetaDataTablesPath(databaseName, schemaName), table);
}
/**
- * Get view Metadata path.
+ * Get view meta data path.
*
* @param databaseName database name
* @param schemaName schema name
* @param view view name
- * @return view Metadata path
+ * @return view meta data path
*/
- public static String getViewMetadataPath(final String databaseName, final String schemaName, final String view) {
- return String.join("/", getMetadataViewsPath(databaseName, schemaName), view);
+ public static String getViewMetaDataPath(final String databaseName, final String schemaName, final String view) {
+ return String.join("/", getMetaDataViewsPath(databaseName, schemaName), view);
}
- private static String getFullMetadataPath(final String databaseName, final String node) {
+ private static String getFullMetaDataPath(final String databaseName, final String node) {
return String.join("/", "", ROOT_NODE, databaseName, node);
}
@@ -165,7 +165,7 @@ public final class DatabaseMetadataNode {
* @return database name
*/
public static Optional<String> getDatabaseName(final String configNodeFullPath) {
- Pattern pattern = Pattern.compile(getMetadataNodePath() + "/([\\w\\-]+)$", Pattern.CASE_INSENSITIVE);
+ Pattern pattern = Pattern.compile(getMetaDataNodePath() + "/([\\w\\-]+)$", Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(configNodeFullPath);
return matcher.find() ? Optional.of(matcher.group(1)) : Optional.empty();
}
@@ -177,7 +177,7 @@ public final class DatabaseMetadataNode {
* @return schema name
*/
public static Optional<String> getSchemaName(final String configNodeFullPath) {
- Pattern pattern = Pattern.compile(getMetadataNodePath() + "/([\\w\\-]+)/schemas/([\\w\\-]+)$", Pattern.CASE_INSENSITIVE);
+ Pattern pattern = Pattern.compile(getMetaDataNodePath() + "/([\\w\\-]+)/schemas/([\\w\\-]+)$", Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(configNodeFullPath);
return matcher.find() ? Optional.of(matcher.group(2)) : Optional.empty();
}
@@ -189,7 +189,7 @@ public final class DatabaseMetadataNode {
* @return database name
*/
public static Optional<String> getDatabaseNameByDatabasePath(final String databasePath) {
- Pattern pattern = Pattern.compile(getMetadataNodePath() + "/([\\w\\-]+)?", Pattern.CASE_INSENSITIVE);
+ Pattern pattern = Pattern.compile(getMetaDataNodePath() + "/([\\w\\-]+)?", Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(databasePath);
return matcher.find() ? Optional.of(matcher.group(1)) : Optional.empty();
}
@@ -201,64 +201,64 @@ public final class DatabaseMetadataNode {
* @return schema name
*/
public static Optional<String> getSchemaNameBySchemaPath(final String schemaPath) {
- Pattern pattern = Pattern.compile(getMetadataNodePath() + "/([\\w\\-]+)/schemas/([\\w\\-]+)?", Pattern.CASE_INSENSITIVE);
+ Pattern pattern = Pattern.compile(getMetaDataNodePath() + "/([\\w\\-]+)/schemas/([\\w\\-]+)?", Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(schemaPath);
return matcher.find() ? Optional.of(matcher.group(2)) : Optional.empty();
}
/**
- * Get table Metadata path.
+ * Get table meta data path.
*
- * @param tableMetadataPath table Metadata path
+ * @param tableMetaDataPath table meta data path
* @return table name
*/
- public static Optional<String> getTableName(final String tableMetadataPath) {
- Pattern pattern = Pattern.compile(getMetadataNodePath() + "/([\\w\\-]+)/([\\w\\-]+)/([\\w\\-]+)/tables" + "/([\\w\\-]+)$", Pattern.CASE_INSENSITIVE);
- Matcher matcher = pattern.matcher(tableMetadataPath);
+ public static Optional<String> getTableName(final String tableMetaDataPath) {
+ Pattern pattern = Pattern.compile(getMetaDataNodePath() + "/([\\w\\-]+)/([\\w\\-]+)/([\\w\\-]+)/tables" + "/([\\w\\-]+)$", Pattern.CASE_INSENSITIVE);
+ Matcher matcher = pattern.matcher(tableMetaDataPath);
return matcher.find() ? Optional.of(matcher.group(4)) : Optional.empty();
}
/**
- * Get view Metadata path.
+ * Get view meta data path.
*
- * @param viewMetadataPath view Metadata path
+ * @param viewMetaDataPath view meta data path
* @return view name
*/
- public static Optional<String> getViewName(final String viewMetadataPath) {
- Pattern pattern = Pattern.compile(getMetadataNodePath() + "/([\\w\\-]+)/([\\w\\-]+)/([\\w\\-]+)/views" + "/([\\w\\-]+)$", Pattern.CASE_INSENSITIVE);
- Matcher matcher = pattern.matcher(viewMetadataPath);
+ public static Optional<String> getViewName(final String viewMetaDataPath) {
+ Pattern pattern = Pattern.compile(getMetaDataNodePath() + "/([\\w\\-]+)/([\\w\\-]+)/([\\w\\-]+)/views" + "/([\\w\\-]+)$", Pattern.CASE_INSENSITIVE);
+ Matcher matcher = pattern.matcher(viewMetaDataPath);
return matcher.find() ? Optional.of(matcher.group(4)) : Optional.empty();
}
/**
* Get active version path.
- *
+ *
* @param databaseName database name
* @return active version path
*/
public static String getActiveVersionPath(final String databaseName) {
- return getFullMetadataPath(databaseName, ACTIVE_VERSION);
+ return getFullMetaDataPath(databaseName, ACTIVE_VERSION);
}
/**
* Get database version path.
- *
+ *
* @param databaseName database name
* @param version version
* @return database version path
*/
public static String getDatabaseVersionPath(final String databaseName, final String version) {
- return String.join("/", getFullMetadataPath(databaseName, VERSIONS), version);
+ return String.join("/", getFullMetaDataPath(databaseName, VERSIONS), version);
}
/**
* Get version by data sources path.
- *
+ *
* @param dataSourceNodeFullPath data sources node full path
* @return version
*/
public static Optional<String> getVersionByDataSourcesPath(final String dataSourceNodeFullPath) {
- Pattern pattern = Pattern.compile(getMetadataNodePath() + "/([\\w\\-]+)/versions/([\\w\\-]+)/data_sources", Pattern.CASE_INSENSITIVE);
+ Pattern pattern = Pattern.compile(getMetaDataNodePath() + "/([\\w\\-]+)/versions/([\\w\\-]+)/data_sources", Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(dataSourceNodeFullPath);
return matcher.find() ? Optional.of(matcher.group(2)) : Optional.empty();
}
@@ -270,7 +270,7 @@ public final class DatabaseMetadataNode {
* @return version
*/
public static Optional<String> getVersionByRulesPath(final String rulesNodeFullPath) {
- Pattern pattern = Pattern.compile(getMetadataNodePath() + "/([\\w\\-]+)/versions/([\\w\\-]+)/rules", Pattern.CASE_INSENSITIVE);
+ Pattern pattern = Pattern.compile(getMetaDataNodePath() + "/([\\w\\-]+)/versions/([\\w\\-]+)/rules", Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(rulesNodeFullPath);
return matcher.find() ? Optional.of(matcher.group(2)) : Optional.empty();
}
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/node/ShardingSphereDataNode.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/node/ShardingSphereDataNode.java
index 5b84d777d4b..c154b59fbae 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/node/ShardingSphereDataNode.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/node/ShardingSphereDataNode.java
@@ -39,7 +39,7 @@ public final class ShardingSphereDataNode {
/**
* Get ShardingSphere data node path.
*
- * @return Metadata node path
+ * @return meta data node path
*/
public static String getShardingSphereDataNodePath() {
return String.join("/", "", ROOT_NODE);
@@ -56,7 +56,7 @@ public final class ShardingSphereDataNode {
}
/**
- * Get Metadata tables path.
+ * Get meta data tables path.
*
* @param databaseName database name
* @param schemaName schema name
@@ -78,7 +78,7 @@ public final class ShardingSphereDataNode {
}
/**
- * Get Metadata schemas path.
+ * Get meta data schemas path.
*
* @param databaseName database name
* @return schemas path
@@ -88,12 +88,12 @@ public final class ShardingSphereDataNode {
}
/**
- * Get table Metadata path.
+ * Get table meta data path.
*
* @param databaseName database name
* @param schemaName schema name
* @param table table name
- * @return table Metadata path
+ * @return table meta data path
*/
public static String getTablePath(final String databaseName, final String schemaName, final String table) {
return String.join("/", getTablesPath(databaseName, schemaName), table);
@@ -106,7 +106,7 @@ public final class ShardingSphereDataNode {
* @param schemaName schema name
* @param table table name
* @param uniqueKey unique key
- * @return table Metadata path
+ * @return table meta data path
*/
public static String getTableRowPath(final String databaseName, final String schemaName, final String table, final String uniqueKey) {
return String.join("/", getTablePath(databaseName, schemaName, table), uniqueKey);
@@ -163,12 +163,12 @@ public final class ShardingSphereDataNode {
/**
* Get table data path.
*
- * @param tableMetadataPath table data path
+ * @param tableMetaDataPath table data path
* @return table name
*/
- public static Optional<String> getTableName(final String tableMetadataPath) {
+ public static Optional<String> getTableName(final String tableMetaDataPath) {
Pattern pattern = Pattern.compile(getShardingSphereDataNodePath() + "/([\\w\\-]+)/schemas/([\\w\\-]+)/tables" + "/([\\w\\-]+)$", Pattern.CASE_INSENSITIVE);
- Matcher matcher = pattern.matcher(tableMetadataPath);
+ Matcher matcher = pattern.matcher(tableMetaDataPath);
return matcher.find() ? Optional.of(matcher.group(3)) : Optional.empty();
}
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/DatabaseMetadataPersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/DatabaseMetaDataPersistService.java
similarity index 80%
rename from mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/DatabaseMetadataPersistService.java
rename to mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/DatabaseMetaDataPersistService.java
index 2209b31d739..324677e2869 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/DatabaseMetadataPersistService.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/DatabaseMetaDataPersistService.java
@@ -21,9 +21,9 @@ import lombok.Getter;
import org.apache.shardingsphere.infra.metadata.database.schema.SchemaManager;
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereTable;
-import org.apache.shardingsphere.mode.metadata.persist.node.DatabaseMetadataNode;
-import org.apache.shardingsphere.mode.metadata.persist.service.schema.TableMetadataPersistService;
-import org.apache.shardingsphere.mode.metadata.persist.service.schema.ViewMetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.persist.node.DatabaseMetaDataNode;
+import org.apache.shardingsphere.mode.metadata.persist.service.schema.TableMetaDataPersistService;
+import org.apache.shardingsphere.mode.metadata.persist.service.schema.ViewMetaDataPersistService;
import org.apache.shardingsphere.mode.persist.PersistRepository;
import java.util.Collection;
@@ -31,30 +31,30 @@ import java.util.LinkedHashMap;
import java.util.Map;
/**
- * Database Metadata registry service.
+ * Database meta data registry service.
*/
@Getter
-public final class DatabaseMetadataPersistService {
+public final class DatabaseMetaDataPersistService {
private final PersistRepository repository;
- private final TableMetadataPersistService tableMetaDataPersistService;
+ private final TableMetaDataPersistService tableMetaDataPersistService;
- private final ViewMetadataPersistService viewMetaDataPersistService;
+ private final ViewMetaDataPersistService viewMetaDataPersistService;
- public DatabaseMetadataPersistService(final PersistRepository repository) {
+ public DatabaseMetaDataPersistService(final PersistRepository repository) {
this.repository = repository;
- this.tableMetaDataPersistService = new TableMetadataPersistService(repository);
- this.viewMetaDataPersistService = new ViewMetadataPersistService(repository);
+ this.tableMetaDataPersistService = new TableMetaDataPersistService(repository);
+ this.viewMetaDataPersistService = new ViewMetaDataPersistService(repository);
}
/**
* Add database name.
- *
+ *
* @param databaseName database name
*/
public void addDatabase(final String databaseName) {
- repository.persist(DatabaseMetadataNode.getDatabaseNamePath(databaseName), "");
+ repository.persist(DatabaseMetaDataNode.getDatabaseNamePath(databaseName), "");
}
/**
@@ -63,7 +63,7 @@ public final class DatabaseMetadataPersistService {
* @param databaseName database name to be deleted
*/
public void dropDatabase(final String databaseName) {
- repository.delete(DatabaseMetadataNode.getDatabaseNamePath(databaseName));
+ repository.delete(DatabaseMetaDataNode.getDatabaseNamePath(databaseName));
}
/**
@@ -72,7 +72,7 @@ public final class DatabaseMetadataPersistService {
* @return all database names
*/
public Collection<String> loadAllDatabaseNames() {
- return repository.getChildrenKeys(DatabaseMetadataNode.getMetadataNodePath());
+ return repository.getChildrenKeys(DatabaseMetaDataNode.getMetaDataNodePath());
}
/**
@@ -82,7 +82,7 @@ public final class DatabaseMetadataPersistService {
* @param schemaName schema name
*/
public void addSchema(final String databaseName, final String schemaName) {
- repository.persist(DatabaseMetadataNode.getMetadataTablesPath(databaseName, schemaName), "");
+ repository.persist(DatabaseMetaDataNode.getMetaDataTablesPath(databaseName, schemaName), "");
}
/**
@@ -92,15 +92,15 @@ public final class DatabaseMetadataPersistService {
* @param schemaName schema name
*/
public void dropSchema(final String databaseName, final String schemaName) {
- repository.delete(DatabaseMetadataNode.getMetadataSchemaPath(databaseName, schemaName));
+ repository.delete(DatabaseMetaDataNode.getMetaDataSchemaPath(databaseName, schemaName));
}
/**
- * Compare and persist schema Metadata.
+ * Compare and persist schema meta data.
*
* @param databaseName database name
* @param schemaName schema name
- * @param schema schema Metadata
+ * @param schema schema meta data
*/
public void compareAndPersist(final String databaseName, final String schemaName, final ShardingSphereSchema schema) {
if (schema.getTables().isEmpty() && schema.getViews().isEmpty()) {
@@ -112,11 +112,11 @@ public final class DatabaseMetadataPersistService {
}
/**
- * Persist schema Metadata.
+ * Persist schema meta data.
*
* @param databaseName database name
* @param schemaName schema name
- * @param schema schema Metadata
+ * @param schema schema meta data
*/
public void persist(final String databaseName, final String schemaName, final ShardingSphereSchema schema) {
if (schema.getTables().isEmpty() && schema.getViews().isEmpty()) {
@@ -126,21 +126,21 @@ public final class DatabaseMetadataPersistService {
}
/**
- * Delete schema Metadata.
+ * Delete schema meta data.
*
* @param databaseName database name
* @param schemaName schema name
- * @param schema schema Metadata
+ * @param schema schema meta data
*/
public void delete(final String databaseName, final String schemaName, final ShardingSphereSchema schema) {
schema.getTables().forEach((key, value) -> tableMetaDataPersistService.delete(databaseName, schemaName, key));
}
/**
- * Load schema Metadata.
+ * Load schema meta data.
*
* @param databaseName database name
- * @return schema Metadata
+ * @return schema meta data
*/
public Map<String, ShardingSphereSchema> loadSchemas(final String databaseName) {
Collection<String> schemaNames = loadAllSchemaNames(databaseName);
@@ -151,6 +151,6 @@ public final class DatabaseMetadataPersistService {
}
private Collection<String> loadAllSchemaNames(final String databaseName) {
- return repository.getChildrenKeys(DatabaseMetadataNode.getMetadataSchemasPath(databaseName));
+ return repository.getChildrenKeys(DatabaseMetaDataNode.getMetaDataSchemasPath(databaseName));
}
}
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/MetadataVersionPersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/MetaDataVersionPersistService.java
similarity index 84%
rename from mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/MetadataVersionPersistService.java
rename to mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/MetaDataVersionPersistService.java
index 251ab986b12..0d87bd3b784 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/MetadataVersionPersistService.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/MetaDataVersionPersistService.java
@@ -18,17 +18,17 @@
package org.apache.shardingsphere.mode.metadata.persist.service;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.mode.metadata.persist.node.DatabaseMetadataNode;
+import org.apache.shardingsphere.mode.metadata.persist.node.DatabaseMetaDataNode;
import org.apache.shardingsphere.mode.persist.PersistRepository;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicLong;
/**
- * Metadata version persist service.
+ * Meta data version persist service.
*/
@RequiredArgsConstructor
-public final class MetadataVersionPersistService {
+public final class MetaDataVersionPersistService {
private final PersistRepository repository;
@@ -39,7 +39,7 @@ public final class MetadataVersionPersistService {
* @return active database version
*/
public Optional<String> getActiveVersion(final String databaseName) {
- return Optional.ofNullable(repository.getDirectly(DatabaseMetadataNode.getActiveVersionPath(databaseName)));
+ return Optional.ofNullable(repository.getDirectly(DatabaseMetaDataNode.getActiveVersionPath(databaseName)));
}
/**
@@ -66,9 +66,9 @@ public final class MetadataVersionPersistService {
return Optional.empty();
}
String newVersion = String.valueOf(new AtomicLong(Long.parseLong(activeVersion.get())).incrementAndGet());
- repository.persist(DatabaseMetadataNode.getRulePath(databaseName, newVersion), repository.getDirectly(DatabaseMetadataNode.getRulePath(databaseName, activeVersion.get())));
+ repository.persist(DatabaseMetaDataNode.getRulePath(databaseName, newVersion), repository.getDirectly(DatabaseMetaDataNode.getRulePath(databaseName, activeVersion.get())));
repository.persist(
- DatabaseMetadataNode.getMetadataDataSourcePath(databaseName, newVersion), repository.getDirectly(DatabaseMetadataNode.getMetadataDataSourcePath(databaseName, activeVersion.get())));
+ DatabaseMetaDataNode.getMetaDataDataSourcePath(databaseName, newVersion), repository.getDirectly(DatabaseMetaDataNode.getMetaDataDataSourcePath(databaseName, activeVersion.get())));
return Optional.of(newVersion);
}
@@ -81,7 +81,7 @@ public final class MetadataVersionPersistService {
public void persistActiveVersion(final String databaseName, final String version) {
Optional<String> activeVersion = getActiveVersion(databaseName);
if (activeVersion.isPresent() && !activeVersion.get().equals(version)) {
- repository.persist(DatabaseMetadataNode.getActiveVersionPath(databaseName), version);
+ repository.persist(DatabaseMetaDataNode.getActiveVersionPath(databaseName), version);
}
}
@@ -92,6 +92,6 @@ public final class MetadataVersionPersistService {
* @param version version
*/
public void deleteVersion(final String databaseName, final String version) {
- repository.delete(DatabaseMetadataNode.getDatabaseVersionPath(databaseName, version));
+ repository.delete(DatabaseMetaDataNode.getDatabaseVersionPath(databaseName, version));
}
}
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DataSourcePersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DataSourcePersistService.java
index c69a86a5a2b..90cab74797d 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DataSourcePersistService.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DataSourcePersistService.java
@@ -22,7 +22,7 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
import org.apache.shardingsphere.infra.yaml.config.swapper.resource.YamlDataSourceConfigurationSwapper;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import org.apache.shardingsphere.mode.metadata.persist.node.DatabaseMetadataNode;
+import org.apache.shardingsphere.mode.metadata.persist.node.DatabaseMetaDataNode;
import org.apache.shardingsphere.mode.persist.PersistRepository;
import java.util.LinkedHashMap;
@@ -50,15 +50,15 @@ public final class DataSourcePersistService implements DatabaseBasedPersistServi
@Override
public void persist(final String databaseName, final Map<String, DataSourceProperties> dataSourcePropsMap) {
if (Strings.isNullOrEmpty(getDatabaseActiveVersion(databaseName))) {
- repository.persist(DatabaseMetadataNode.getActiveVersionPath(databaseName), DEFAULT_VERSION);
+ repository.persist(DatabaseMetaDataNode.getActiveVersionPath(databaseName), DEFAULT_VERSION);
}
- repository.persist(DatabaseMetadataNode.getMetadataDataSourcePath(databaseName, getDatabaseActiveVersion(databaseName)),
+ repository.persist(DatabaseMetaDataNode.getMetaDataDataSourcePath(databaseName, getDatabaseActiveVersion(databaseName)),
YamlEngine.marshal(swapYamlDataSourceConfiguration(dataSourcePropsMap)));
}
@Override
public void persist(final String databaseName, final String version, final Map<String, DataSourceProperties> dataSourcePropsMap) {
- repository.persist(DatabaseMetadataNode.getMetadataDataSourcePath(databaseName, version), YamlEngine.marshal(swapYamlDataSourceConfiguration(dataSourcePropsMap)));
+ repository.persist(DatabaseMetaDataNode.getMetaDataDataSourcePath(databaseName, version), YamlEngine.marshal(swapYamlDataSourceConfiguration(dataSourcePropsMap)));
}
private Map<String, Map<String, Object>> swapYamlDataSourceConfiguration(final Map<String, DataSourceProperties> dataSourcePropsMap) {
@@ -69,12 +69,12 @@ public final class DataSourcePersistService implements DatabaseBasedPersistServi
@Override
public Map<String, DataSourceProperties> load(final String databaseName) {
return isExisted(databaseName) ? getDataSourceProperties(repository.getDirectly(
- DatabaseMetadataNode.getMetadataDataSourcePath(databaseName, getDatabaseActiveVersion(databaseName)))) : new LinkedHashMap<>();
+ DatabaseMetaDataNode.getMetaDataDataSourcePath(databaseName, getDatabaseActiveVersion(databaseName)))) : new LinkedHashMap<>();
}
@Override
public Map<String, DataSourceProperties> load(final String databaseName, final String version) {
- String yamlContent = repository.getDirectly(DatabaseMetadataNode.getMetadataDataSourcePath(databaseName, version));
+ String yamlContent = repository.getDirectly(DatabaseMetaDataNode.getMetaDataDataSourcePath(databaseName, version));
return Strings.isNullOrEmpty(yamlContent) ? new LinkedHashMap<>() : getDataSourceProperties(yamlContent);
}
@@ -91,7 +91,7 @@ public final class DataSourcePersistService implements DatabaseBasedPersistServi
@Override
public boolean isExisted(final String databaseName) {
- return !Strings.isNullOrEmpty(getDatabaseActiveVersion(databaseName)) && !Strings.isNullOrEmpty(repository.getDirectly(DatabaseMetadataNode.getMetadataDataSourcePath(databaseName,
+ return !Strings.isNullOrEmpty(getDatabaseActiveVersion(databaseName)) && !Strings.isNullOrEmpty(repository.getDirectly(DatabaseMetaDataNode.getMetaDataDataSourcePath(databaseName,
getDatabaseActiveVersion(databaseName))));
}
@@ -108,6 +108,6 @@ public final class DataSourcePersistService implements DatabaseBasedPersistServi
}
private String getDatabaseActiveVersion(final String databaseName) {
- return repository.getDirectly(DatabaseMetadataNode.getActiveVersionPath(databaseName));
+ return repository.getDirectly(DatabaseMetaDataNode.getActiveVersionPath(databaseName));
}
}
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DatabaseRulePersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DatabaseRulePersistService.java
index 1a56a3c5122..1d991c5273f 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DatabaseRulePersistService.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DatabaseRulePersistService.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
import org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapperEngine;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import org.apache.shardingsphere.mode.metadata.persist.node.DatabaseMetadataNode;
+import org.apache.shardingsphere.mode.metadata.persist.node.DatabaseMetaDataNode;
import org.apache.shardingsphere.mode.persist.PersistRepository;
import java.util.Collection;
@@ -49,14 +49,14 @@ public final class DatabaseRulePersistService implements DatabaseBasedPersistSer
@Override
public void persist(final String databaseName, final Collection<RuleConfiguration> configs) {
if (Strings.isNullOrEmpty(getDatabaseActiveVersion(databaseName))) {
- repository.persist(DatabaseMetadataNode.getActiveVersionPath(databaseName), DEFAULT_VERSION);
+ repository.persist(DatabaseMetaDataNode.getActiveVersionPath(databaseName), DEFAULT_VERSION);
}
- repository.persist(DatabaseMetadataNode.getRulePath(databaseName, getDatabaseActiveVersion(databaseName)), YamlEngine.marshal(createYamlRuleConfigurations(configs)));
+ repository.persist(DatabaseMetaDataNode.getRulePath(databaseName, getDatabaseActiveVersion(databaseName)), YamlEngine.marshal(createYamlRuleConfigurations(configs)));
}
@Override
public void persist(final String databaseName, final String version, final Collection<RuleConfiguration> configs) {
- repository.persist(DatabaseMetadataNode.getRulePath(databaseName, version), YamlEngine.marshal(createYamlRuleConfigurations(configs)));
+ repository.persist(DatabaseMetaDataNode.getRulePath(databaseName, version), YamlEngine.marshal(createYamlRuleConfigurations(configs)));
}
private Collection<YamlRuleConfiguration> createYamlRuleConfigurations(final Collection<RuleConfiguration> ruleConfigs) {
@@ -67,7 +67,7 @@ public final class DatabaseRulePersistService implements DatabaseBasedPersistSer
@Override
public Collection<RuleConfiguration> load(final String databaseName) {
return isExisted(databaseName)
- ? new YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(YamlEngine.unmarshal(repository.getDirectly(DatabaseMetadataNode.getRulePath(databaseName,
+ ? new YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(YamlEngine.unmarshal(repository.getDirectly(DatabaseMetaDataNode.getRulePath(databaseName,
getDatabaseActiveVersion(databaseName))), Collection.class, true))
: new LinkedList<>();
}
@@ -75,19 +75,19 @@ public final class DatabaseRulePersistService implements DatabaseBasedPersistSer
@SuppressWarnings("unchecked")
@Override
public Collection<RuleConfiguration> load(final String databaseName, final String version) {
- String yamlContent = repository.getDirectly(DatabaseMetadataNode.getRulePath(databaseName, version));
+ String yamlContent = repository.getDirectly(DatabaseMetaDataNode.getRulePath(databaseName, version));
return Strings.isNullOrEmpty(yamlContent) ? new LinkedList<>()
- : new YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(YamlEngine.unmarshal(repository.getDirectly(DatabaseMetadataNode
+ : new YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(YamlEngine.unmarshal(repository.getDirectly(DatabaseMetaDataNode
.getRulePath(databaseName, getDatabaseActiveVersion(databaseName))), Collection.class, true));
}
@Override
public boolean isExisted(final String databaseName) {
return !Strings.isNullOrEmpty(getDatabaseActiveVersion(databaseName))
- && !Strings.isNullOrEmpty(repository.getDirectly(DatabaseMetadataNode.getRulePath(databaseName, getDatabaseActiveVersion(databaseName))));
+ && !Strings.isNullOrEmpty(repository.getDirectly(DatabaseMetaDataNode.getRulePath(databaseName, getDatabaseActiveVersion(databaseName))));
}
private String getDatabaseActiveVersion(final String databaseName) {
- return repository.getDirectly(DatabaseMetadataNode.getActiveVersionPath(databaseName));
+ return repository.getDirectly(DatabaseMetaDataNode.getActiveVersionPath(databaseName));
}
}
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/SchemaMetadataPersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/SchemaMetaDataPersistService.java
similarity index 87%
rename from mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/SchemaMetadataPersistService.java
rename to mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/SchemaMetaDataPersistService.java
index d2b35f93be2..7dc80c25fa3 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/SchemaMetadataPersistService.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/SchemaMetaDataPersistService.java
@@ -18,27 +18,27 @@
package org.apache.shardingsphere.mode.metadata.persist.service.schema;
/**
- * Schema Metadata persist service.
+ * Schema meta data persist service.
*
* @param <T> type of schema
*/
-public interface SchemaMetadataPersistService<T> {
+public interface SchemaMetaDataPersistService<T> {
/**
- * Persist Metadata.
+ * Persist meta data.
*
* @param databaseName database name
* @param schemaName schema name
- * @param schema schema Metadata
+ * @param schema schema meta data
*/
void persist(String databaseName, String schemaName, T schema);
/**
- * Load schema Metadata.
+ * Load schema meta data.
*
* @param databaseName database name
* @param schemaName schema name
- * @return schema Metadata
+ * @return schema meta data
*/
T load(String databaseName, String schemaName);
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/TableMetadataPersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/TableMetaDataPersistService.java
similarity index 85%
rename from mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/TableMetadataPersistService.java
rename to mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/TableMetaDataPersistService.java
index 353930a567e..c2cb199b75b 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/TableMetadataPersistService.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/TableMetaDataPersistService.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.schema.pojo.YamlShardingSphereTable;
import org.apache.shardingsphere.infra.yaml.schema.swapper.YamlTableSwapper;
-import org.apache.shardingsphere.mode.metadata.persist.node.DatabaseMetadataNode;
+import org.apache.shardingsphere.mode.metadata.persist.node.DatabaseMetaDataNode;
import org.apache.shardingsphere.mode.persist.PersistRepository;
import java.util.Map;
@@ -32,34 +32,34 @@ import java.util.Collection;
import java.util.Collections;
/**
- * Table Metadata persist service.
+ * Table meta data persist service.
*/
@RequiredArgsConstructor
-public final class TableMetadataPersistService implements SchemaMetadataPersistService<Map<String, ShardingSphereTable>> {
+public final class TableMetaDataPersistService implements SchemaMetaDataPersistService<Map<String, ShardingSphereTable>> {
private final PersistRepository repository;
@Override
public void persist(final String databaseName, final String schemaName, final Map<String, ShardingSphereTable> tables) {
- tables.forEach((key, value) -> repository.persist(DatabaseMetadataNode.getTableMetadataPath(databaseName, schemaName, key.toLowerCase()),
+ tables.forEach((key, value) -> repository.persist(DatabaseMetaDataNode.getTableMetaDataPath(databaseName, schemaName, key.toLowerCase()),
YamlEngine.marshal(new YamlTableSwapper().swapToYamlConfiguration(value))));
}
@Override
public Map<String, ShardingSphereTable> load(final String databaseName, final String schemaName) {
- Collection<String> tableNames = repository.getChildrenKeys(DatabaseMetadataNode.getMetadataTablesPath(databaseName, schemaName));
+ Collection<String> tableNames = repository.getChildrenKeys(DatabaseMetaDataNode.getMetaDataTablesPath(databaseName, schemaName));
return tableNames.isEmpty() ? Collections.emptyMap() : getTableMetaDataByTableNames(databaseName, schemaName, tableNames);
}
@Override
public void delete(final String databaseName, final String schemaName, final String tableName) {
- repository.delete(DatabaseMetadataNode.getTableMetadataPath(databaseName, schemaName, tableName.toLowerCase()));
+ repository.delete(DatabaseMetaDataNode.getTableMetaDataPath(databaseName, schemaName, tableName.toLowerCase()));
}
private Map<String, ShardingSphereTable> getTableMetaDataByTableNames(final String databaseName, final String schemaName, final Collection<String> tableNames) {
Map<String, ShardingSphereTable> result = new LinkedHashMap<>(tableNames.size(), 1);
tableNames.forEach(each -> {
- String table = repository.getDirectly(DatabaseMetadataNode.getTableMetadataPath(databaseName, schemaName, each));
+ String table = repository.getDirectly(DatabaseMetaDataNode.getTableMetaDataPath(databaseName, schemaName, each));
if (!Strings.isNullOrEmpty(table)) {
result.put(each.toLowerCase(), new YamlTableSwapper().swapToObject(YamlEngine.unmarshal(table, YamlShardingSphereTable.class)));
}
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/ViewMetadataPersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/ViewMetaDataPersistService.java
similarity index 82%
rename from mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/ViewMetadataPersistService.java
rename to mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/ViewMetaDataPersistService.java
index 04a89be2bbf..85f86f735ae 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/ViewMetadataPersistService.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/ViewMetaDataPersistService.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.schema.pojo.YamlShardingSphereView;
import org.apache.shardingsphere.infra.yaml.schema.swapper.YamlViewSwapper;
-import org.apache.shardingsphere.mode.metadata.persist.node.DatabaseMetadataNode;
+import org.apache.shardingsphere.mode.metadata.persist.node.DatabaseMetaDataNode;
import org.apache.shardingsphere.mode.persist.PersistRepository;
import java.util.Collection;
@@ -32,34 +32,34 @@ import java.util.LinkedHashMap;
import java.util.Map;
/**
- * View Metadata persist service.
+ * View meta data persist service.
*/
@RequiredArgsConstructor
-public final class ViewMetadataPersistService implements SchemaMetadataPersistService<Map<String, ShardingSphereView>> {
+public final class ViewMetaDataPersistService implements SchemaMetaDataPersistService<Map<String, ShardingSphereView>> {
private final PersistRepository repository;
@Override
public void persist(final String databaseName, final String schemaName, final Map<String, ShardingSphereView> views) {
- views.forEach((key, value) -> repository.persist(DatabaseMetadataNode.getViewMetadataPath(databaseName, schemaName, key.toLowerCase()),
+ views.forEach((key, value) -> repository.persist(DatabaseMetaDataNode.getViewMetaDataPath(databaseName, schemaName, key.toLowerCase()),
YamlEngine.marshal(new YamlViewSwapper().swapToYamlConfiguration(value))));
}
@Override
public Map<String, ShardingSphereView> load(final String databaseName, final String schemaName) {
- Collection<String> viewNames = repository.getChildrenKeys(DatabaseMetadataNode.getMetadataViewsPath(databaseName, schemaName));
- return viewNames.isEmpty() ? Collections.emptyMap() : getViewMetadataByViewNames(databaseName, schemaName, viewNames);
+ Collection<String> viewNames = repository.getChildrenKeys(DatabaseMetaDataNode.getMetaDataViewsPath(databaseName, schemaName));
+ return viewNames.isEmpty() ? Collections.emptyMap() : getViewMetaDataByViewNames(databaseName, schemaName, viewNames);
}
@Override
public void delete(final String databaseName, final String schemaName, final String viewName) {
- repository.delete(DatabaseMetadataNode.getViewMetadataPath(databaseName, schemaName, viewName.toLowerCase()));
+ repository.delete(DatabaseMetaDataNode.getViewMetaDataPath(databaseName, schemaName, viewName.toLowerCase()));
}
- private Map<String, ShardingSphereView> getViewMetadataByViewNames(final String databaseName, final String schemaName, final Collection<String> viewNames) {
+ private Map<String, ShardingSphereView> getViewMetaDataByViewNames(final String databaseName, final String schemaName, final Collection<String> viewNames) {
Map<String, ShardingSphereView> result = new LinkedHashMap<>(viewNames.size(), 1);
viewNames.forEach(each -> {
- String view = repository.getDirectly(DatabaseMetadataNode.getViewMetadataPath(databaseName, schemaName, each));
+ String view = repository.getDirectly(DatabaseMetaDataNode.getViewMetaDataPath(databaseName, schemaName, each));
if (!Strings.isNullOrEmpty(view)) {
result.put(each.toLowerCase(), new YamlViewSwapper().swapToObject(YamlEngine.unmarshal(view, YamlShardingSphereView.class)));
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
index 7dcb33f0895..0dc0e33dcb5 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
@@ -34,9 +34,9 @@ import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereTable;
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereView;
import org.apache.shardingsphere.infra.rule.identifier.type.MutableDataNodeRule;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
-import org.apache.shardingsphere.mode.metadata.persist.service.DatabaseMetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
+import org.apache.shardingsphere.mode.metadata.persist.service.DatabaseMetaDataPersistService;
import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.apache.shardingsphere.transaction.config.TransactionRuleConfiguration;
import org.junit.Before;
@@ -70,22 +70,22 @@ import static org.mockito.Mockito.when;
public final class ContextManagerTest {
- private MetadataContexts metadataContexts;
+ private MetaDataContexts metaDataContexts;
private ContextManager contextManager;
@Before
public void setUp() {
- metadataContexts = mock(MetadataContexts.class, RETURNS_DEEP_STUBS);
- when(metadataContexts.getMetadata().getGlobalRuleMetaData().getRules()).thenReturn(Collections.emptyList());
- when(metadataContexts.getMetadata().getProps().getValue(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE)).thenReturn(1);
- when(metadataContexts.getMetadata().getProps()).thenReturn(new ConfigurationProperties(new Properties()));
+ metaDataContexts = mock(MetaDataContexts.class, RETURNS_DEEP_STUBS);
+ when(metaDataContexts.getMetaData().getGlobalRuleMetaData().getRules()).thenReturn(Collections.emptyList());
+ when(metaDataContexts.getMetaData().getProps().getValue(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE)).thenReturn(1);
+ when(metaDataContexts.getMetaData().getProps()).thenReturn(new ConfigurationProperties(new Properties()));
ShardingSphereDatabase database = mockDatabase();
- when(metadataContexts.getMetadata().containsDatabase("foo_db")).thenReturn(true);
- when(metadataContexts.getMetadata().getDatabase("foo_db")).thenReturn(database);
- when(metadataContexts.getMetadata().getDatabase("foo_db").containsSchema("foo_schema")).thenReturn(true);
- when(metadataContexts.getMetadata().getDatabases().values()).thenReturn(Collections.singleton(database));
- contextManager = new ContextManager(metadataContexts, mock(InstanceContext.class));
+ when(metaDataContexts.getMetaData().containsDatabase("foo_db")).thenReturn(true);
+ when(metaDataContexts.getMetaData().getDatabase("foo_db")).thenReturn(database);
+ when(metaDataContexts.getMetaData().getDatabase("foo_db").containsSchema("foo_schema")).thenReturn(true);
+ when(metaDataContexts.getMetaData().getDatabases().values()).thenReturn(Collections.singleton(database));
+ contextManager = new ContextManager(metaDataContexts, mock(InstanceContext.class));
}
private ShardingSphereDatabase mockDatabase() {
@@ -101,96 +101,96 @@ public final class ContextManagerTest {
@Test
public void assertGetDataSourceMap() {
- ShardingSphereResourceMetaData resourceMetadata = new ShardingSphereResourceMetaData("sharding_db", Collections.singletonMap("foo_ds", new MockedDataSource()));
+ ShardingSphereResourceMetaData resourceMetaData = new ShardingSphereResourceMetaData("sharding_db", Collections.singletonMap("foo_ds", new MockedDataSource()));
ShardingSphereDatabase database =
- new ShardingSphereDatabase(DefaultDatabase.LOGIC_NAME, mock(DatabaseType.class), resourceMetadata, mock(ShardingSphereRuleMetaData.class), Collections.emptyMap());
- when(metadataContexts.getMetadata().getDatabase(DefaultDatabase.LOGIC_NAME)).thenReturn(database);
+ new ShardingSphereDatabase(DefaultDatabase.LOGIC_NAME, mock(DatabaseType.class), resourceMetaData, mock(ShardingSphereRuleMetaData.class), Collections.emptyMap());
+ when(metaDataContexts.getMetaData().getDatabase(DefaultDatabase.LOGIC_NAME)).thenReturn(database);
assertThat(contextManager.getDataSourceMap(DefaultDatabase.LOGIC_NAME).size(), is(1));
}
@Test
- public void assertRenewMetadataContexts() {
- MetadataContexts contexts = mock(MetadataContexts.class);
- contextManager.renewMetadataContexts(contexts);
- assertThat(contextManager.getMetadataContexts(), is(contexts));
+ public void assertRenewMetaDataContexts() {
+ MetaDataContexts contexts = mock(MetaDataContexts.class);
+ contextManager.renewMetaDataContexts(contexts);
+ assertThat(contextManager.getMetaDataContexts(), is(contexts));
}
@Test
public void assertAddDatabase() throws SQLException {
contextManager.addDatabaseAndPersist("new_db");
- verify(metadataContexts.getMetadata()).addDatabase(eq("new_db"), any(DatabaseType.class));
+ verify(metaDataContexts.getMetaData()).addDatabase(eq("new_db"), any(DatabaseType.class));
}
@Test
public void assertAddDatabaseAndPersist() throws SQLException {
contextManager.addDatabaseAndPersist("new_db");
- verify(metadataContexts.getMetadata()).addDatabase(eq("new_db"), any(DatabaseType.class));
+ verify(metaDataContexts.getMetaData()).addDatabase(eq("new_db"), any(DatabaseType.class));
}
@Test
public void assertAddExistedDatabase() throws SQLException {
- when(metadataContexts.getMetadata().containsDatabase("foo_db")).thenReturn(true);
+ when(metaDataContexts.getMetaData().containsDatabase("foo_db")).thenReturn(true);
contextManager.addDatabaseAndPersist("foo_db");
- verify(metadataContexts.getMetadata(), times(0)).addDatabase(eq("foo_db"), any(DatabaseType.class));
+ verify(metaDataContexts.getMetaData(), times(0)).addDatabase(eq("foo_db"), any(DatabaseType.class));
}
@Test
public void assertAddExistedDatabaseAndPersist() throws SQLException {
- when(metadataContexts.getMetadata().containsDatabase("foo_db")).thenReturn(true);
+ when(metaDataContexts.getMetaData().containsDatabase("foo_db")).thenReturn(true);
contextManager.addDatabaseAndPersist("foo_db");
- verify(metadataContexts.getMetadata(), times(0)).addDatabase(eq("foo_db"), any(DatabaseType.class));
+ verify(metaDataContexts.getMetaData(), times(0)).addDatabase(eq("foo_db"), any(DatabaseType.class));
}
@Test
public void assertDropDatabase() {
- when(metadataContexts.getMetadata().getActualDatabaseName("foo_db")).thenReturn("foo_db");
- when(metadataContexts.getMetadata().containsDatabase("foo_db")).thenReturn(true);
+ when(metaDataContexts.getMetaData().getActualDatabaseName("foo_db")).thenReturn("foo_db");
+ when(metaDataContexts.getMetaData().containsDatabase("foo_db")).thenReturn(true);
contextManager.dropDatabaseAndPersist("foo_db");
- verify(metadataContexts.getMetadata()).dropDatabase("foo_db");
+ verify(metaDataContexts.getMetaData()).dropDatabase("foo_db");
}
@Test
public void assertDropDatabaseAndPersist() {
- when(metadataContexts.getMetadata().getActualDatabaseName("foo_db")).thenReturn("foo_db");
- when(metadataContexts.getMetadata().containsDatabase("foo_db")).thenReturn(true);
+ when(metaDataContexts.getMetaData().getActualDatabaseName("foo_db")).thenReturn("foo_db");
+ when(metaDataContexts.getMetaData().containsDatabase("foo_db")).thenReturn(true);
contextManager.dropDatabaseAndPersist("foo_db");
- verify(metadataContexts.getMetadata()).dropDatabase("foo_db");
+ verify(metaDataContexts.getMetaData()).dropDatabase("foo_db");
}
@Test
public void assertDropNotExistedDatabase() {
contextManager.dropDatabaseAndPersist("not_existed_db");
- verify(metadataContexts.getMetadata(), times(0)).dropDatabase("not_existed_db");
+ verify(metaDataContexts.getMetaData(), times(0)).dropDatabase("not_existed_db");
}
@Test
public void assertDropNotExistedDatabaseAndPersist() {
contextManager.dropDatabaseAndPersist("not_existed_db");
- verify(metadataContexts.getMetadata(), times(0)).dropDatabase("not_existed_db");
+ verify(metaDataContexts.getMetaData(), times(0)).dropDatabase("not_existed_db");
}
@Test
public void assertAddSchema() {
contextManager.addSchema("foo_db", "bar_schema");
- verify(metadataContexts.getMetadata().getDatabase("foo_db")).putSchema(anyString(), any(ShardingSphereSchema.class));
+ verify(metaDataContexts.getMetaData().getDatabase("foo_db")).putSchema(anyString(), any(ShardingSphereSchema.class));
}
@Test
public void assertAddExistedSchema() {
- when(contextManager.getMetadataContexts().getMetadata().getDatabase("foo_db").containsSchema("foo_schema")).thenReturn(true);
+ when(contextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").containsSchema("foo_schema")).thenReturn(true);
contextManager.addSchema("foo_db", "foo_schema");
- verify(metadataContexts.getMetadata().getDatabase("foo_db"), times(0)).putSchema(anyString(), any(ShardingSphereSchema.class));
+ verify(metaDataContexts.getMetaData().getDatabase("foo_db"), times(0)).putSchema(anyString(), any(ShardingSphereSchema.class));
}
@Test
public void assertAlterSchemaForTableAltered() {
ShardingSphereSchema toBeAlteredSchema = createToBeAlteredSchema();
- when(metadataContexts.getMetadata().getDatabase("foo_db").getSchemas()).thenReturn(Collections.singletonMap("foo_schema", toBeAlteredSchema));
- when(metadataContexts.getMetadata().getDatabase("foo_db").getSchema("foo_schema")).thenReturn(toBeAlteredSchema);
+ when(metaDataContexts.getMetaData().getDatabase("foo_db").getSchemas()).thenReturn(Collections.singletonMap("foo_schema", toBeAlteredSchema));
+ when(metaDataContexts.getMetaData().getDatabase("foo_db").getSchema("foo_schema")).thenReturn(toBeAlteredSchema);
ShardingSphereColumn toBeChangedColumn = new ShardingSphereColumn("foo_col", Types.VARCHAR, false, false, false, true, false);
ShardingSphereTable toBeChangedTable = new ShardingSphereTable("foo_tbl", Collections.singleton(toBeChangedColumn), Collections.emptyList(), Collections.emptyList());
contextManager.alterSchema("foo_db", "foo_schema", toBeChangedTable, null);
- ShardingSphereTable table = contextManager.getMetadataContexts().getMetadata().getDatabase("foo_db").getSchema("foo_schema").getTables().get("foo_tbl");
+ ShardingSphereTable table = contextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").getSchema("foo_schema").getTables().get("foo_tbl");
assertThat(table.getColumns().size(), is(1));
assertTrue(table.getColumns().containsKey("foo_col"));
}
@@ -198,27 +198,27 @@ public final class ContextManagerTest {
@Test
public void assertAlterSchemaForViewAltered() {
ShardingSphereSchema toBeAlteredSchema = createToBeAlteredSchema();
- when(metadataContexts.getMetadata().getDatabase("foo_db").getSchemas()).thenReturn(Collections.singletonMap("foo_schema", toBeAlteredSchema));
- when(metadataContexts.getMetadata().getDatabase("foo_db").getSchema("foo_schema")).thenReturn(toBeAlteredSchema);
+ when(metaDataContexts.getMetaData().getDatabase("foo_db").getSchemas()).thenReturn(Collections.singletonMap("foo_schema", toBeAlteredSchema));
+ when(metaDataContexts.getMetaData().getDatabase("foo_db").getSchema("foo_schema")).thenReturn(toBeAlteredSchema);
ShardingSphereView toBeChangedView = new ShardingSphereView("foo_view", "select `foo_view`.`foo_view`.`id` AS `id` from `foo_view`.`foo_view`");
contextManager.alterSchema("foo_db", "foo_schema", null, toBeChangedView);
- ShardingSphereView view = contextManager.getMetadataContexts().getMetadata().getDatabase("foo_db").getSchema("foo_schema").getView("foo_view");
+ ShardingSphereView view = contextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").getSchema("foo_schema").getView("foo_view");
assertThat(view.getName(), is("foo_view"));
assertThat(view.getViewDefinition(), is("select `foo_view`.`foo_view`.`id` AS `id` from `foo_view`.`foo_view`"));
}
@Test
public void assertAlterSchemaForTableDropped() {
- when(metadataContexts.getMetadata().getDatabase("foo_db").getSchemas()).thenReturn(Collections.singletonMap("foo_schema", createToBeAlteredSchema()));
+ when(metaDataContexts.getMetaData().getDatabase("foo_db").getSchemas()).thenReturn(Collections.singletonMap("foo_schema", createToBeAlteredSchema()));
contextManager.alterSchema("foo_db", "foo_schema", "foo_tbl", null);
- assertFalse(contextManager.getMetadataContexts().getMetadata().getDatabase("foo_db").getSchema("foo_schema").getTables().containsKey("foo_tbl"));
+ assertFalse(contextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").getSchema("foo_schema").getTables().containsKey("foo_tbl"));
}
@Test
public void assertAlterSchemaForViewDropped() {
- when(metadataContexts.getMetadata().getDatabase("foo_db").getSchemas()).thenReturn(Collections.singletonMap("foo_schema", createToBeAlteredSchema()));
+ when(metaDataContexts.getMetaData().getDatabase("foo_db").getSchemas()).thenReturn(Collections.singletonMap("foo_schema", createToBeAlteredSchema()));
contextManager.alterSchema("foo_db", "foo_schema", "foo_view", null);
- assertFalse(contextManager.getMetadataContexts().getMetadata().getDatabase("foo_db").getSchema("foo_schema").getViews().containsKey("foo_view"));
+ assertFalse(contextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").getSchema("foo_schema").getViews().containsKey("foo_view"));
}
private ShardingSphereSchema createToBeAlteredSchema() {
@@ -230,22 +230,22 @@ public final class ContextManagerTest {
@Ignore
@Test
public void assertUpdateResources() throws SQLException {
- ShardingSphereDatabase originalDatabase = createOriginalDatabaseMetadata();
- ShardingSphereResourceMetaData originalResourceMetadata = originalDatabase.getResourceMetaData();
- DataSource originalDataSource = originalResourceMetadata.getDataSources().get("bar_ds");
- when(metadataContexts.getMetadata().getDatabase("foo_db")).thenReturn(originalDatabase);
+ ShardingSphereDatabase originalDatabase = createOriginalDatabaseMetaData();
+ ShardingSphereResourceMetaData originalResourceMetaData = originalDatabase.getResourceMetaData();
+ DataSource originalDataSource = originalResourceMetaData.getDataSources().get("bar_ds");
+ when(metaDataContexts.getMetaData().getDatabase("foo_db")).thenReturn(originalDatabase);
contextManager.updateResources("foo_db", Collections.singletonMap("bar_ds", new DataSourceProperties(MockedDataSource.class.getName(),
createProperties("test", "test"))));
- verify(originalResourceMetadata, times(1)).close(originalDataSource);
- assertAlteredDataSource((MockedDataSource) contextManager.getMetadataContexts().getMetadata().getDatabase("foo_db").getResourceMetaData().getDataSources().get("bar_ds"));
+ verify(originalResourceMetaData, times(1)).close(originalDataSource);
+ assertAlteredDataSource((MockedDataSource) contextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").getResourceMetaData().getDataSources().get("bar_ds"));
}
- private ShardingSphereDatabase createOriginalDatabaseMetadata() {
- ShardingSphereResourceMetaData resourceMetadata = mock(ShardingSphereResourceMetaData.class);
- when(resourceMetadata.getDataSources()).thenReturn(Collections.singletonMap("bar_ds", new MockedDataSource()));
- ShardingSphereRuleMetaData ruleMetadata = mock(ShardingSphereRuleMetaData.class);
- when(ruleMetadata.getConfigurations()).thenReturn(new LinkedList<>());
- return new ShardingSphereDatabase("foo_db", new MySQLDatabaseType(), resourceMetadata, ruleMetadata, Collections.emptyMap());
+ private ShardingSphereDatabase createOriginalDatabaseMetaData() {
+ ShardingSphereResourceMetaData resourceMetaData = mock(ShardingSphereResourceMetaData.class);
+ when(resourceMetaData.getDataSources()).thenReturn(Collections.singletonMap("bar_ds", new MockedDataSource()));
+ ShardingSphereRuleMetaData ruleMetaData = mock(ShardingSphereRuleMetaData.class);
+ when(ruleMetaData.getConfigurations()).thenReturn(new LinkedList<>());
+ return new ShardingSphereDatabase("foo_db", new MySQLDatabaseType(), resourceMetaData, ruleMetaData, Collections.emptyMap());
}
private void assertAlteredDataSource(final MockedDataSource actual) {
@@ -257,47 +257,47 @@ public final class ContextManagerTest {
@Test
public void assertDropResources() throws SQLException {
ShardingSphereDatabase database = new ShardingSphereDatabase(
- "foo_db", new MySQLDatabaseType(), createOriginalResource(), createOriginalRuleMetadata(), Collections.emptyMap());
- when(metadataContexts.getMetadata().getDatabase("foo_db")).thenReturn(database);
+ "foo_db", new MySQLDatabaseType(), createOriginalResource(), createOriginalRuleMetaData(), Collections.emptyMap());
+ when(metaDataContexts.getMetaData().getDatabase("foo_db")).thenReturn(database);
Map<String, ShardingSphereDatabase> databases = new LinkedHashMap<>(1, 1);
databases.put("foo_db", database);
- when(metadataContexts.getMetadata().getDatabases()).thenReturn(databases);
- when(metadataContexts.getMetadata().getActualDatabaseName("foo_db")).thenReturn("foo_db");
- when(metadataContexts.getPersistService()).thenReturn(mock(MetadataPersistService.class, RETURNS_DEEP_STUBS));
+ when(metaDataContexts.getMetaData().getDatabases()).thenReturn(databases);
+ when(metaDataContexts.getMetaData().getActualDatabaseName("foo_db")).thenReturn("foo_db");
+ when(metaDataContexts.getPersistService()).thenReturn(mock(MetaDataPersistService.class, RETURNS_DEEP_STUBS));
Map<String, DataSourceProperties> dataSourcePropertiesMap = new LinkedHashMap<>(1, 1);
dataSourcePropertiesMap.put("ds_1", mock(DataSourceProperties.class));
dataSourcePropertiesMap.put("ds_2", mock(DataSourceProperties.class));
- when(metadataContexts.getPersistService().getDataSourceService().load("foo_db")).thenReturn(dataSourcePropertiesMap);
+ when(metaDataContexts.getPersistService().getDataSourceService().load("foo_db")).thenReturn(dataSourcePropertiesMap);
contextManager.dropResources("foo_db", Arrays.asList("ds_1", "ds_2"));
- assertTrue(metadataContexts.getMetadata().getDatabases().get("foo_db").getResourceMetaData().getDataSources().isEmpty());
+ assertTrue(metaDataContexts.getMetaData().getDatabases().get("foo_db").getResourceMetaData().getDataSources().isEmpty());
}
@Test
public void assertAlterRuleConfiguration() {
- ShardingSphereResourceMetaData resourceMetadata = mock(ShardingSphereResourceMetaData.class);
- when(resourceMetadata.getDataSources()).thenReturn(Collections.singletonMap("ds_0", new MockedDataSource()));
- ShardingSphereDatabase database = new ShardingSphereDatabase("foo_db", new MySQLDatabaseType(), resourceMetadata, mock(ShardingSphereRuleMetaData.class), Collections.emptyMap());
- when(metadataContexts.getMetadata().getDatabase("foo_db")).thenReturn(database);
- when(metadataContexts.getMetadata().getGlobalRuleMetaData()).thenReturn(new ShardingSphereRuleMetaData(Collections.emptyList()));
- when(metadataContexts.getPersistService()).thenReturn(mock(MetadataPersistService.class, RETURNS_DEEP_STUBS));
- when(metadataContexts.getMetadata().getActualDatabaseName("foo_db")).thenReturn("foo_db");
+ ShardingSphereResourceMetaData resourceMetaData = mock(ShardingSphereResourceMetaData.class);
+ when(resourceMetaData.getDataSources()).thenReturn(Collections.singletonMap("ds_0", new MockedDataSource()));
+ ShardingSphereDatabase database = new ShardingSphereDatabase("foo_db", new MySQLDatabaseType(), resourceMetaData, mock(ShardingSphereRuleMetaData.class), Collections.emptyMap());
+ when(metaDataContexts.getMetaData().getDatabase("foo_db")).thenReturn(database);
+ when(metaDataContexts.getMetaData().getGlobalRuleMetaData()).thenReturn(new ShardingSphereRuleMetaData(Collections.emptyList()));
+ when(metaDataContexts.getPersistService()).thenReturn(mock(MetaDataPersistService.class, RETURNS_DEEP_STUBS));
+ when(metaDataContexts.getMetaData().getActualDatabaseName("foo_db")).thenReturn("foo_db");
// TODO TransactionRule is global rule, do not use it in database rule test
RuleConfiguration ruleConfig = new TransactionRuleConfiguration("LOCAL", null, new Properties());
contextManager.alterRuleConfiguration("foo_db", Collections.singleton(ruleConfig));
// TODO create DistributedRuleFixture to assert alter rule
- // assertTrue(contextManager.getMetadataContexts().getMetadata().getDatabase("foo_db").getRuleMetadata().getConfigurations().contains(ruleConfig));
+ // assertTrue(contextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").getRuleMetaData().getConfigurations().contains(ruleConfig));
}
@Test
public void assertAlterDataSourceConfiguration() {
- ShardingSphereDatabase originalDatabaseMetadata = new ShardingSphereDatabase(
- "foo_db", new MySQLDatabaseType(), createOriginalResource(), createOriginalRuleMetadata(), Collections.emptyMap());
- when(metadataContexts.getMetadata().getDatabase("foo_db")).thenReturn(originalDatabaseMetadata);
- when(metadataContexts.getMetadata().getActualDatabaseName("foo_db")).thenReturn("foo_db");
- when(metadataContexts.getMetadata().getGlobalRuleMetaData()).thenReturn(new ShardingSphereRuleMetaData(Collections.emptyList()));
+ ShardingSphereDatabase originalDatabaseMetaData = new ShardingSphereDatabase(
+ "foo_db", new MySQLDatabaseType(), createOriginalResource(), createOriginalRuleMetaData(), Collections.emptyMap());
+ when(metaDataContexts.getMetaData().getDatabase("foo_db")).thenReturn(originalDatabaseMetaData);
+ when(metaDataContexts.getMetaData().getActualDatabaseName("foo_db")).thenReturn("foo_db");
+ when(metaDataContexts.getMetaData().getGlobalRuleMetaData()).thenReturn(new ShardingSphereRuleMetaData(Collections.emptyList()));
contextManager.alterDataSourceConfiguration("foo_db", Collections.singletonMap("foo_ds", new DataSourceProperties(MockedDataSource.class.getName(), createProperties("test", "test"))));
- assertThat(contextManager.getMetadataContexts().getMetadata().getDatabase("foo_db").getResourceMetaData().getDataSources().size(), is(3));
- assertAlteredDataSource((MockedDataSource) contextManager.getMetadataContexts().getMetadata().getDatabase("foo_db").getResourceMetaData().getDataSources().get("foo_ds"));
+ assertThat(contextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").getResourceMetaData().getDataSources().size(), is(3));
+ assertAlteredDataSource((MockedDataSource) contextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").getResourceMetaData().getDataSources().get("foo_ds"));
}
private ShardingSphereResourceMetaData createOriginalResource() {
@@ -309,7 +309,7 @@ public final class ContextManagerTest {
return result;
}
- private ShardingSphereRuleMetaData createOriginalRuleMetadata() {
+ private ShardingSphereRuleMetaData createOriginalRuleMetaData() {
ShardingSphereRuleMetaData result = mock(ShardingSphereRuleMetaData.class);
when(result.getConfigurations()).thenReturn(Collections.singleton(mock(RuleConfiguration.class)));
return result;
@@ -319,7 +319,7 @@ public final class ContextManagerTest {
public void assertAlterGlobalRuleConfiguration() {
RuleConfiguration ruleConfig = new TransactionRuleConfiguration("LOCAL", null, new Properties());
contextManager.alterGlobalRuleConfiguration(Collections.singleton(ruleConfig));
- assertTrue(contextManager.getMetadataContexts().getMetadata().getGlobalRuleMetaData().getConfigurations().contains(ruleConfig));
+ assertTrue(contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getConfigurations().contains(ruleConfig));
}
@Test
@@ -327,31 +327,31 @@ public final class ContextManagerTest {
Properties props = new Properties();
props.put("foo", "foo_value");
contextManager.alterProperties(props);
- assertThat(contextManager.getMetadataContexts().getMetadata().getProps().getProps().getProperty("foo"), is("foo_value"));
+ assertThat(contextManager.getMetaDataContexts().getMetaData().getProps().getProps().getProperty("foo"), is("foo_value"));
}
@Test
public void assertReloadSchema() {
- when(metadataContexts.getMetadata().getDatabase("foo_db").getResourceMetaData().getDataSources()).thenReturn(Collections.singletonMap("foo_ds", new MockedDataSource()));
- when(metadataContexts.getMetadata().getActualDatabaseName("foo_db")).thenReturn("foo_db");
- DatabaseMetadataPersistService databaseMetadataPersistService = mock(DatabaseMetadataPersistService.class, RETURNS_DEEP_STUBS);
- MetadataPersistService persistService = mock(MetadataPersistService.class);
- when(persistService.getDatabaseMetadataService()).thenReturn(databaseMetadataPersistService);
- when(metadataContexts.getPersistService()).thenReturn(persistService);
+ when(metaDataContexts.getMetaData().getDatabase("foo_db").getResourceMetaData().getDataSources()).thenReturn(Collections.singletonMap("foo_ds", new MockedDataSource()));
+ when(metaDataContexts.getMetaData().getActualDatabaseName("foo_db")).thenReturn("foo_db");
+ DatabaseMetaDataPersistService databaseMetaDataPersistService = mock(DatabaseMetaDataPersistService.class, RETURNS_DEEP_STUBS);
+ MetaDataPersistService persistService = mock(MetaDataPersistService.class);
+ when(persistService.getDatabaseMetaDataService()).thenReturn(databaseMetaDataPersistService);
+ when(metaDataContexts.getPersistService()).thenReturn(persistService);
contextManager.reloadSchema("foo_db", "foo_schema", "foo_ds");
- verify(databaseMetadataPersistService, times(1)).dropSchema(eq("foo_db"), eq("foo_schema"));
+ verify(databaseMetaDataPersistService, times(1)).dropSchema(eq("foo_db"), eq("foo_schema"));
}
@Test
public void assertReloadTable() {
- when(metadataContexts.getMetadata().getDatabase("foo_db").getResourceMetaData().getDataSources()).thenReturn(Collections.singletonMap("foo_ds", new MockedDataSource()));
- when(metadataContexts.getMetadata().getDatabase("foo_db").getResourceMetaData().getStorageTypes()).thenReturn(Collections.singletonMap("foo_ds", mock(DatabaseType.class)));
- DatabaseMetadataPersistService databaseMetadataPersistService = mock(DatabaseMetadataPersistService.class, RETURNS_DEEP_STUBS);
- MetadataPersistService persistService = mock(MetadataPersistService.class);
- when(persistService.getDatabaseMetadataService()).thenReturn(databaseMetadataPersistService);
- when(metadataContexts.getPersistService()).thenReturn(persistService);
+ when(metaDataContexts.getMetaData().getDatabase("foo_db").getResourceMetaData().getDataSources()).thenReturn(Collections.singletonMap("foo_ds", new MockedDataSource()));
+ when(metaDataContexts.getMetaData().getDatabase("foo_db").getResourceMetaData().getStorageTypes()).thenReturn(Collections.singletonMap("foo_ds", mock(DatabaseType.class)));
+ DatabaseMetaDataPersistService databaseMetaDataPersistService = mock(DatabaseMetaDataPersistService.class, RETURNS_DEEP_STUBS);
+ MetaDataPersistService persistService = mock(MetaDataPersistService.class);
+ when(persistService.getDatabaseMetaDataService()).thenReturn(databaseMetaDataPersistService);
+ when(metaDataContexts.getPersistService()).thenReturn(persistService);
contextManager.reloadTable("foo_db", "foo_schema", "foo_table");
- assertTrue(contextManager.getMetadataContexts().getMetadata().getDatabase("foo_db").getResourceMetaData().getDataSources().containsKey("foo_ds"));
+ assertTrue(contextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").getResourceMetaData().getDataSources().containsKey("foo_ds"));
}
private Map<String, Object> createProperties(final String username, final String password) {
@@ -365,6 +365,6 @@ public final class ContextManagerTest {
@Test
public void assertClose() throws Exception {
contextManager.close();
- verify(metadataContexts).close();
+ verify(metaDataContexts).close();
}
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetadataContextsFactoryTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactoryTest.java
similarity index 79%
rename from mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetadataContextsFactoryTest.java
rename to mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactoryTest.java
index b1ecc7179d3..ba6ab5a6adf 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetadataContextsFactoryTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactoryTest.java
@@ -26,8 +26,8 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabases
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.rule.builder.global.GlobalRulesBuilder;
import org.apache.shardingsphere.mode.manager.ContextManagerBuilderParameter;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
-import org.apache.shardingsphere.mode.metadata.persist.service.DatabaseMetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
+import org.apache.shardingsphere.mode.metadata.persist.service.DatabaseMetaDataPersistService;
import org.apache.shardingsphere.mode.metadata.persist.service.config.database.DatabaseRulePersistService;
import org.apache.shardingsphere.mode.metadata.persist.service.config.global.GlobalRulePersistService;
import org.apache.shardingsphere.mode.metadata.persist.service.config.global.PropertiesPersistService;
@@ -65,19 +65,19 @@ import static org.mockito.Mockito.mockStatic;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
-public final class MetadataContextsFactoryTest {
+public final class MetaDataContextsFactoryTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private MetadataPersistService metadataPersistService;
+ private MetaDataPersistService metaDataPersistService;
@Mock
- private DatabaseMetadataPersistService databaseMetadataPersistService;
+ private DatabaseMetaDataPersistService databaseMetaDataPersistService;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private ShardingSphereDatabase database;
@Mock
- private JDBCInstanceMetaData jdbcInstanceMetadata;
+ private JDBCInstanceMetaData jdbcInstanceMetaData;
private final Collection<ShardingSphereRule> rules = new LinkedList<>();
@@ -91,15 +91,15 @@ public final class MetadataContextsFactoryTest {
public void setUp() {
rules.add(new MockedRule());
databases.put("foo_db", database);
- when(metadataPersistService.getEffectiveDataSources(eq("foo_db"), anyMap())).thenReturn(Collections.singletonMap("foo_ds", new MockedDataSource()));
+ when(metaDataPersistService.getEffectiveDataSources(eq("foo_db"), anyMap())).thenReturn(Collections.singletonMap("foo_ds", new MockedDataSource()));
DatabaseRulePersistService databaseRulePersistService = mockDatabaseRulePersistService();
- when(metadataPersistService.getDatabaseRulePersistService()).thenReturn(databaseRulePersistService);
+ when(metaDataPersistService.getDatabaseRulePersistService()).thenReturn(databaseRulePersistService);
GlobalRulePersistService globalRulePersistService = mockGlobalRulePersistService();
- when(metadataPersistService.getGlobalRuleService()).thenReturn(globalRulePersistService);
+ when(metaDataPersistService.getGlobalRuleService()).thenReturn(globalRulePersistService);
PropertiesPersistService propertiesPersistService = mock(PropertiesPersistService.class);
when(propertiesPersistService.load()).thenReturn(new Properties());
- when(metadataPersistService.getPropsService()).thenReturn(propertiesPersistService);
- when(metadataPersistService.getDatabaseMetadataService()).thenReturn(databaseMetadataPersistService);
+ when(metaDataPersistService.getPropsService()).thenReturn(propertiesPersistService);
+ when(metaDataPersistService.getDatabaseMetaDataService()).thenReturn(databaseMetaDataPersistService);
mockDatabasesFactory();
mockGlobalRulesBuilder();
}
@@ -129,25 +129,25 @@ public final class MetadataContextsFactoryTest {
@Test
public void assertCreateWithJDBCInstanceMetadata() throws SQLException {
InstanceContext instanceContext = mock(InstanceContext.class, RETURNS_DEEP_STUBS);
- when(instanceContext.getInstance().getMetaData()).thenReturn(jdbcInstanceMetadata);
- try (MetadataContexts actual = MetadataContextsFactory.create(metadataPersistService, createContextManagerBuilderParameter(), instanceContext)) {
- assertThat(actual.getMetadata().getGlobalRuleMetaData().getRules().size(), is(1));
- assertThat(actual.getMetadata().getGlobalRuleMetaData().getRules().iterator().next(), instanceOf(MockedRule.class));
- assertTrue(actual.getMetadata().getDatabases().containsKey("foo_db"));
- assertThat(actual.getMetadata().getDatabases().size(), is(1));
+ when(instanceContext.getInstance().getMetaData()).thenReturn(jdbcInstanceMetaData);
+ try (MetaDataContexts actual = MetaDataContextsFactory.create(metaDataPersistService, createContextManagerBuilderParameter(), instanceContext)) {
+ assertThat(actual.getMetaData().getGlobalRuleMetaData().getRules().size(), is(1));
+ assertThat(actual.getMetaData().getGlobalRuleMetaData().getRules().iterator().next(), instanceOf(MockedRule.class));
+ assertTrue(actual.getMetaData().getDatabases().containsKey("foo_db"));
+ assertThat(actual.getMetaData().getDatabases().size(), is(1));
}
}
@Test
public void assertCreateWithProxyInstanceMetadata() throws SQLException {
- when(databaseMetadataPersistService.loadAllDatabaseNames()).thenReturn(Collections.singletonList("foo_db"));
- when(metadataPersistService.getDatabaseMetadataService()).thenReturn(databaseMetadataPersistService);
- try (MetadataContexts actual = MetadataContextsFactory.create(metadataPersistService, createContextManagerBuilderParameter(), mock(InstanceContext.class, RETURNS_DEEP_STUBS))) {
- assertThat(actual.getPersistService(), is(metadataPersistService));
- assertThat(actual.getMetadata().getGlobalRuleMetaData().getRules().size(), is(1));
- assertThat(actual.getMetadata().getGlobalRuleMetaData().getRules().iterator().next(), instanceOf(MockedRule.class));
- assertTrue(actual.getMetadata().getDatabases().containsKey("foo_db"));
- assertThat(actual.getMetadata().getDatabases().size(), is(1));
+ when(databaseMetaDataPersistService.loadAllDatabaseNames()).thenReturn(Collections.singletonList("foo_db"));
+ when(metaDataPersistService.getDatabaseMetaDataService()).thenReturn(databaseMetaDataPersistService);
+ try (MetaDataContexts actual = MetaDataContextsFactory.create(metaDataPersistService, createContextManagerBuilderParameter(), mock(InstanceContext.class, RETURNS_DEEP_STUBS))) {
+ assertThat(actual.getPersistService(), is(metaDataPersistService));
+ assertThat(actual.getMetaData().getGlobalRuleMetaData().getRules().size(), is(1));
+ assertThat(actual.getMetaData().getGlobalRuleMetaData().getRules().iterator().next(), instanceOf(MockedRule.class));
+ assertTrue(actual.getMetaData().getDatabases().containsKey("foo_db"));
+ assertThat(actual.getMetaData().getDatabases().size(), is(1));
}
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetadataContextsTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsTest.java
similarity index 88%
rename from mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetadataContextsTest.java
rename to mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsTest.java
index 48d6158d6ff..5908351ba4c 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetadataContextsTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsTest.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.database.DefaultDatabase;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
@@ -38,16 +38,16 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
@RunWith(MockitoJUnitRunner.class)
-public final class MetadataContextsTest {
+public final class MetaDataContextsTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private ShardingSphereDatabase database;
@Test
- public void assertGetDefaultMetadata() {
+ public void assertGetDefaultMetaData() {
Map<String, ShardingSphereDatabase> databases = new LinkedHashMap<>(1, 1);
databases.put(DefaultDatabase.LOGIC_NAME, database);
ShardingSphereMetaData metaData = new ShardingSphereMetaData(databases, mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new Properties()));
- assertThat(new MetadataContexts(mock(MetadataPersistService.class), metaData).getMetadata().getDatabase(DefaultDatabase.LOGIC_NAME), is(database));
+ assertThat(new MetaDataContexts(mock(MetaDataPersistService.class), metaData).getMetaData().getDatabase(DefaultDatabase.LOGIC_NAME), is(database));
}
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetadataPersistServiceTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
similarity index 94%
rename from mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetadataPersistServiceTest.java
rename to mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
index 96886637a71..c869f7571b5 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetadataPersistServiceTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
@@ -57,7 +57,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@RunWith(MockitoJUnitRunner.class)
-public final class MetadataPersistServiceTest {
+public final class MetaDataPersistServiceTest {
private static final String SCHEMA_RULE_YAML = "yaml/persist/data-database-rule.yaml";
@@ -73,11 +73,11 @@ public final class MetadataPersistServiceTest {
@Mock
private PropertiesPersistService propsService;
- private MetadataPersistService metadataPersistService;
+ private MetaDataPersistService metaDataPersistService;
@Before
public void setUp() throws ReflectiveOperationException {
- metadataPersistService = new MetadataPersistService(mock(PersistRepository.class));
+ metaDataPersistService = new MetaDataPersistService(mock(PersistRepository.class));
setField("dataSourceService", dataSourceService);
setField("databaseRulePersistService", databaseRulePersistService);
setField("globalRuleService", globalRuleService);
@@ -85,9 +85,9 @@ public final class MetadataPersistServiceTest {
}
private void setField(final String name, final Object value) throws ReflectiveOperationException {
- Field field = metadataPersistService.getClass().getDeclaredField(name);
+ Field field = metaDataPersistService.getClass().getDeclaredField(name);
field.setAccessible(true);
- field.set(metadataPersistService, value);
+ field.set(metaDataPersistService, value);
}
@Test
@@ -96,7 +96,7 @@ public final class MetadataPersistServiceTest {
Collection<RuleConfiguration> ruleConfigs = createRuleConfigurations();
Collection<RuleConfiguration> globalRuleConfigs = createGlobalRuleConfigurations();
Properties props = createProperties();
- metadataPersistService.persistConfigurations(
+ metaDataPersistService.persistConfigurations(
Collections.singletonMap("foo_db", new DataSourceProvidedDatabaseConfiguration(dataSourceMap, ruleConfigs)), globalRuleConfigs, props);
verify(dataSourceService).conditionalPersist("foo_db", createDataSourcePropertiesMap(dataSourceMap));
verify(databaseRulePersistService).conditionalPersist("foo_db", ruleConfigs);
@@ -150,7 +150,7 @@ public final class MetadataPersistServiceTest {
Map<String, DataSource> dataSourceMap = createDataSourceMap();
Collection<RuleConfiguration> ruleConfigs = createRuleConfigurations();
Map<String, DatabaseConfiguration> databaseConfigs = Collections.singletonMap("foo_db", new DataSourceProvidedDatabaseConfiguration(dataSourceMap, ruleConfigs));
- Map<String, DataSource> resultEffectiveDataSources = metadataPersistService.getEffectiveDataSources("foo_db", databaseConfigs);
+ Map<String, DataSource> resultEffectiveDataSources = metaDataPersistService.getEffectiveDataSources("foo_db", databaseConfigs);
assertTrue(resultEffectiveDataSources.isEmpty());
}
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/node/DatabaseMetadataNodeTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/node/DatabaseMetaDataNodeTest.java
similarity index 73%
rename from mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/node/DatabaseMetadataNodeTest.java
rename to mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/node/DatabaseMetaDataNodeTest.java
index 3371e4611e7..53f283cfe16 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/node/DatabaseMetadataNodeTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/node/DatabaseMetaDataNodeTest.java
@@ -26,111 +26,111 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
-public class DatabaseMetadataNodeTest {
+public class DatabaseMetaDataNodeTest {
@Test
public void assertGetRulePath() {
- assertThat(DatabaseMetadataNode.getRulePath(DefaultDatabase.LOGIC_NAME, "0"), is("/metadata/logic_db/versions/0/rules"));
+ assertThat(DatabaseMetaDataNode.getRulePath(DefaultDatabase.LOGIC_NAME, "0"), is("/metadata/logic_db/versions/0/rules"));
}
@Test
public void assertGetDatabaseName() {
- Optional<String> actualSchemaName = DatabaseMetadataNode.getDatabaseName("/metadata/logic_db");
+ Optional<String> actualSchemaName = DatabaseMetaDataNode.getDatabaseName("/metadata/logic_db");
assertTrue(actualSchemaName.isPresent());
assertThat(actualSchemaName.get(), is("logic_db"));
}
@Test
public void assertGetDatabaseNameWithLine() {
- Optional<String> actualSchemaName = DatabaseMetadataNode.getDatabaseNameByDatabasePath("/metadata/logic-db-test/schemas/logic-db-schema");
+ Optional<String> actualSchemaName = DatabaseMetaDataNode.getDatabaseNameByDatabasePath("/metadata/logic-db-test/schemas/logic-db-schema");
assertTrue(actualSchemaName.isPresent());
assertThat(actualSchemaName.get(), is("logic-db-test"));
}
@Test
public void assertGetDatabaseNamePath() {
- assertThat(DatabaseMetadataNode.getDatabaseNamePath("sharding_db"), is("/metadata/sharding_db"));
+ assertThat(DatabaseMetaDataNode.getDatabaseNamePath("sharding_db"), is("/metadata/sharding_db"));
}
@Test
- public void assertGetMetadataTablesPath() {
- assertThat(DatabaseMetadataNode.getMetadataTablesPath("sharding_db", "sharding_schema"), is("/metadata/sharding_db/schemas/sharding_schema/tables"));
+ public void assertGetMetaDataTablesPath() {
+ assertThat(DatabaseMetaDataNode.getMetaDataTablesPath("sharding_db", "sharding_schema"), is("/metadata/sharding_db/schemas/sharding_schema/tables"));
}
@Test
- public void assertGetMetadataViewsPath() {
- assertThat(DatabaseMetadataNode.getMetadataViewsPath("sharding_db", "sharding_schema"), is("/metadata/sharding_db/schemas/sharding_schema/views"));
+ public void assertGetMetaDataViewsPath() {
+ assertThat(DatabaseMetaDataNode.getMetaDataViewsPath("sharding_db", "sharding_schema"), is("/metadata/sharding_db/schemas/sharding_schema/views"));
}
@Test
public void assertGetDatabaseNameByDatabasePath() {
- Optional<String> actualSchemaName = DatabaseMetadataNode.getDatabaseNameByDatabasePath("/metadata/logic_db/schemas/logic_schema");
+ Optional<String> actualSchemaName = DatabaseMetaDataNode.getDatabaseNameByDatabasePath("/metadata/logic_db/schemas/logic_schema");
assertTrue(actualSchemaName.isPresent());
assertThat(actualSchemaName.get(), is("logic_db"));
}
@Test
public void assertGetTableName() {
- Optional<String> actualTableName = DatabaseMetadataNode.getTableName("/metadata/logic_db/schemas/logic_schema/tables/t_order");
+ Optional<String> actualTableName = DatabaseMetaDataNode.getTableName("/metadata/logic_db/schemas/logic_schema/tables/t_order");
assertTrue(actualTableName.isPresent());
assertThat(actualTableName.get(), is("t_order"));
}
@Test
public void assertGetViewName() {
- Optional<String> actualViewName = DatabaseMetadataNode.getViewName("/metadata/logic_db/schemas/logic_schema/views/foo_view");
+ Optional<String> actualViewName = DatabaseMetaDataNode.getViewName("/metadata/logic_db/schemas/logic_schema/views/foo_view");
assertTrue(actualViewName.isPresent());
assertThat(actualViewName.get(), is("foo_view"));
}
@Test
public void assertGetSchemaName() {
- Optional<String> actualSchemaName = DatabaseMetadataNode.getSchemaName("/metadata/logic_db/schemas/logic_schema");
+ Optional<String> actualSchemaName = DatabaseMetaDataNode.getSchemaName("/metadata/logic_db/schemas/logic_schema");
assertTrue(actualSchemaName.isPresent());
assertThat(actualSchemaName.get(), is("logic_schema"));
}
@Test
public void assertGetVersionByDatabasePath() {
- Optional<String> actualVersion = DatabaseMetadataNode.getVersionByDataSourcesPath("/metadata/logic_db/versions/0/data_sources");
+ Optional<String> actualVersion = DatabaseMetaDataNode.getVersionByDataSourcesPath("/metadata/logic_db/versions/0/data_sources");
assertTrue(actualVersion.isPresent());
assertThat(actualVersion.get(), is("0"));
}
@Test
public void assertGetActiveVersionPath() {
- assertThat(DatabaseMetadataNode.getActiveVersionPath("logic_db"), is("/metadata/logic_db/active_version"));
+ assertThat(DatabaseMetaDataNode.getActiveVersionPath("logic_db"), is("/metadata/logic_db/active_version"));
}
@Test
public void assertGetVersionByRulesPath() {
- Optional<String> actualVersion = DatabaseMetadataNode.getVersionByRulesPath("/metadata/logic_db/versions/0/rules");
+ Optional<String> actualVersion = DatabaseMetaDataNode.getVersionByRulesPath("/metadata/logic_db/versions/0/rules");
assertTrue(actualVersion.isPresent());
assertThat(actualVersion.get(), is("0"));
}
@Test
public void assertGetDatabaseVersionPath() {
- assertThat(DatabaseMetadataNode.getDatabaseVersionPath("logic_db", "0"), is("/metadata/logic_db/versions/0"));
+ assertThat(DatabaseMetaDataNode.getDatabaseVersionPath("logic_db", "0"), is("/metadata/logic_db/versions/0"));
}
@Test
- public void assertGetTableMetadataPath() {
- assertThat(DatabaseMetadataNode.getTableMetadataPath("logic_db", "logic_schema", "order"), is("/metadata/logic_db/schemas/logic_schema/tables/order"));
+ public void assertGetTableMetaDataPath() {
+ assertThat(DatabaseMetaDataNode.getTableMetaDataPath("logic_db", "logic_schema", "order"), is("/metadata/logic_db/schemas/logic_schema/tables/order"));
}
@Test
- public void assertGetViewMetadataPath() {
- assertThat(DatabaseMetadataNode.getViewMetadataPath("logic_db", "logic_schema", "order_view"), is("/metadata/logic_db/schemas/logic_schema/views/order_view"));
+ public void assertGetViewMetaDataPath() {
+ assertThat(DatabaseMetaDataNode.getViewMetaDataPath("logic_db", "logic_schema", "order_view"), is("/metadata/logic_db/schemas/logic_schema/views/order_view"));
}
@Test
- public void assertGetMetadataNodePath() {
- assertThat(DatabaseMetadataNode.getMetadataNodePath(), is("/metadata"));
+ public void assertGetMetaDataNodePath() {
+ assertThat(DatabaseMetaDataNode.getMetaDataNodePath(), is("/metadata"));
}
@Test
- public void assertGetMetadataDataSourcePath() {
- assertThat(DatabaseMetadataNode.getMetadataDataSourcePath(DefaultDatabase.LOGIC_NAME, "0"), is("/metadata/logic_db/versions/0/data_sources"));
+ public void assertGetMetaDataDataSourcePath() {
+ assertThat(DatabaseMetaDataNode.getMetaDataDataSourcePath(DefaultDatabase.LOGIC_NAME, "0"), is("/metadata/logic_db/versions/0/data_sources"));
}
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/DatabaseMetadataPersistServiceTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/DatabaseMetaDataPersistServiceTest.java
similarity index 89%
rename from mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/DatabaseMetadataPersistServiceTest.java
rename to mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/DatabaseMetaDataPersistServiceTest.java
index 249e07e6183..5ff43b6efc7 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/DatabaseMetadataPersistServiceTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/DatabaseMetaDataPersistServiceTest.java
@@ -48,20 +48,20 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
-public final class DatabaseMetadataPersistServiceTest {
+public final class DatabaseMetaDataPersistServiceTest {
@Mock
private PersistRepository repository;
@Test
public void assertPersistEmptySchemas() {
- new DatabaseMetadataPersistService(repository).persist("foo_db", "foo_schema", new ShardingSphereSchema());
+ new DatabaseMetaDataPersistService(repository).persist("foo_db", "foo_schema", new ShardingSphereSchema());
verify(repository).persist(eq("/metadata/foo_db/schemas/foo_schema/tables"), anyString());
}
@Test
public void assertCompareAndPersistEmptySchemas() {
- new DatabaseMetadataPersistService(repository).compareAndPersist("foo_db", "foo_schema", new ShardingSphereSchema());
+ new DatabaseMetaDataPersistService(repository).compareAndPersist("foo_db", "foo_schema", new ShardingSphereSchema());
verify(repository).persist(eq("/metadata/foo_db/schemas/foo_schema/tables"), anyString());
}
@@ -70,39 +70,39 @@ public final class DatabaseMetadataPersistServiceTest {
ShardingSphereTable table = new YamlTableSwapper().swapToObject(YamlEngine.unmarshal(readYAML(), YamlShardingSphereTable.class));
ShardingSphereSchema schema = new ShardingSphereSchema();
schema.getTables().put("t_order", table);
- new DatabaseMetadataPersistService(repository).persist("foo_db", "foo_schema", schema);
+ new DatabaseMetaDataPersistService(repository).persist("foo_db", "foo_schema", schema);
verify(repository).persist(eq("/metadata/foo_db/schemas/foo_schema/tables/t_order"), anyString());
}
@Test
public void assertAddDatabase() {
- new DatabaseMetadataPersistService(repository).addDatabase("foo_db");
+ new DatabaseMetaDataPersistService(repository).addDatabase("foo_db");
verify(repository).persist("/metadata/foo_db", "");
}
@Test
public void assertDropDatabase() {
- new DatabaseMetadataPersistService(repository).dropDatabase("foo_db");
+ new DatabaseMetaDataPersistService(repository).dropDatabase("foo_db");
verify(repository).delete("/metadata/foo_db");
}
@Test
public void assertLoadAllDatabaseNames() {
when(repository.getChildrenKeys("/metadata")).thenReturn(Collections.singletonList("foo_db"));
- Collection<String> actual = new DatabaseMetadataPersistService(repository).loadAllDatabaseNames();
+ Collection<String> actual = new DatabaseMetaDataPersistService(repository).loadAllDatabaseNames();
assertThat(actual.size(), is(1));
assertThat(actual, hasItems("foo_db"));
}
@Test
public void assertAddSchema() {
- new DatabaseMetadataPersistService(repository).addSchema("foo_db", "foo_schema");
+ new DatabaseMetaDataPersistService(repository).addSchema("foo_db", "foo_schema");
verify(repository).persist("/metadata/foo_db/schemas/foo_schema/tables", "");
}
@Test
public void assertDropSchema() {
- new DatabaseMetadataPersistService(repository).dropSchema("foo_db", "foo_schema");
+ new DatabaseMetaDataPersistService(repository).dropSchema("foo_db", "foo_schema");
verify(repository).delete("/metadata/foo_db/schemas/foo_schema");
}
@@ -110,14 +110,14 @@ public final class DatabaseMetadataPersistServiceTest {
public void assertPersistSchemaMetaData() {
ShardingSphereTable table = new ShardingSphereTable("FOO_TABLE", Collections.emptyList(), Collections.emptyList(), Collections.emptyList());
ShardingSphereView view = new ShardingSphereView("FOO_VIEW", "select id from foo_table");
- new DatabaseMetadataPersistService(repository).persist("foo_db", "foo_schema",
+ new DatabaseMetaDataPersistService(repository).persist("foo_db", "foo_schema",
new ShardingSphereSchema(Collections.singletonMap("FOO_TABLE", table), Collections.singletonMap("FOO_VIEW", view)));
verify(repository).persist(eq("/metadata/foo_db/schemas/foo_schema/tables/foo_table"), anyString());
}
@Test
public void assertLoadSchemas() {
- DatabaseMetadataPersistService databaseMetaDataPersistService = new DatabaseMetadataPersistService(repository);
+ DatabaseMetaDataPersistService databaseMetaDataPersistService = new DatabaseMetaDataPersistService(repository);
when(repository.getChildrenKeys("/metadata/foo_db/schemas")).thenReturn(Collections.singletonList("foo_schema"));
when(repository.getChildrenKeys("/metadata/foo_db/schemas/foo_schema/tables")).thenReturn(Collections.singletonList("t_order"));
when(repository.getDirectly("/metadata/foo_db/schemas/foo_schema/tables/t_order")).thenReturn(readYAML());
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/MetadataVersionPersistServiceTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/MetaDataVersionPersistServiceTest.java
similarity index 75%
rename from mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/MetadataVersionPersistServiceTest.java
rename to mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/MetaDataVersionPersistServiceTest.java
index a563071c955..baea0c4e73a 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/MetadataVersionPersistServiceTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/MetaDataVersionPersistServiceTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.mode.metadata.persist.service;
-import org.apache.shardingsphere.mode.metadata.persist.node.DatabaseMetadataNode;
+import org.apache.shardingsphere.mode.metadata.persist.node.DatabaseMetaDataNode;
import org.apache.shardingsphere.mode.persist.PersistRepository;
import org.junit.Before;
import org.junit.Test;
@@ -34,49 +34,49 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-public final class MetadataVersionPersistServiceTest {
+public final class MetaDataVersionPersistServiceTest {
private PersistRepository repository;
- private MetadataVersionPersistService metadataVersionPersistService;
+ private MetaDataVersionPersistService metaDataVersionPersistService;
@Before
public void setUp() {
repository = mock(PersistRepository.class);
when(repository.getDirectly(contains("foo_db"))).thenReturn("1");
- metadataVersionPersistService = new MetadataVersionPersistService(repository);
+ metaDataVersionPersistService = new MetaDataVersionPersistService(repository);
}
@Test
public void assertGetActiveVersion() {
- Optional<String> actual = metadataVersionPersistService.getActiveVersion("foo_db");
+ Optional<String> actual = metaDataVersionPersistService.getActiveVersion("foo_db");
assertTrue(actual.isPresent());
assertThat(actual.get(), is("1"));
}
@Test
public void assertIsActiveVersion() {
- assertTrue(metadataVersionPersistService.isActiveVersion("foo_db", "1"));
+ assertTrue(metaDataVersionPersistService.isActiveVersion("foo_db", "1"));
}
@Test
public void assertIsNotActiveVersionWithNotExistedDatabase() {
- assertFalse(metadataVersionPersistService.isActiveVersion("bar_db", "1"));
+ assertFalse(metaDataVersionPersistService.isActiveVersion("bar_db", "1"));
}
@Test
public void assertIsNotActiveVersionWithNotExistedVersion() {
- assertFalse(metadataVersionPersistService.isActiveVersion("foo_db", "2"));
+ assertFalse(metaDataVersionPersistService.isActiveVersion("foo_db", "2"));
}
@Test
public void assertCreateNewVersionWithoutExistedActiveVersion() {
- assertFalse(metadataVersionPersistService.createNewVersion("bar_db").isPresent());
+ assertFalse(metaDataVersionPersistService.createNewVersion("bar_db").isPresent());
}
@Test
public void assertCreateNewVersionWithExistedActiveVersion() {
- Optional<String> actual = metadataVersionPersistService.createNewVersion("foo_db");
+ Optional<String> actual = metaDataVersionPersistService.createNewVersion("foo_db");
assertTrue(actual.isPresent());
assertThat(actual.get(), is("2"));
verify(repository).persist("/metadata/foo_db/versions/2/rules", "1");
@@ -85,19 +85,19 @@ public final class MetadataVersionPersistServiceTest {
@Test
public void assertPersistActiveVersionWhenExisted() {
- metadataVersionPersistService.persistActiveVersion("foo_db", "2");
- verify(repository).persist(DatabaseMetadataNode.getActiveVersionPath("foo_db"), "2");
+ metaDataVersionPersistService.persistActiveVersion("foo_db", "2");
+ verify(repository).persist(DatabaseMetaDataNode.getActiveVersionPath("foo_db"), "2");
}
@Test
public void assertPersistActiveVersionWithNotExistedDatabase() {
- metadataVersionPersistService.persistActiveVersion("bar_db", "2");
- verify(repository, times(0)).persist(DatabaseMetadataNode.getActiveVersionPath("bar_db"), "2");
+ metaDataVersionPersistService.persistActiveVersion("bar_db", "2");
+ verify(repository, times(0)).persist(DatabaseMetaDataNode.getActiveVersionPath("bar_db"), "2");
}
@Test
public void assertDeleteVersion() {
- metadataVersionPersistService.deleteVersion("foo_db", "1");
- verify(repository).delete(DatabaseMetadataNode.getDatabaseVersionPath("foo_db", "1"));
+ metaDataVersionPersistService.deleteVersion("foo_db", "1");
+ verify(repository).delete(DatabaseMetaDataNode.getDatabaseVersionPath("foo_db", "1"));
}
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/schema/TableMetadataPersistServiceTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/schema/TableMetaDataPersistServiceTest.java
similarity index 91%
rename from mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/schema/TableMetadataPersistServiceTest.java
rename to mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/schema/TableMetaDataPersistServiceTest.java
index 7f1f7b6892a..1445bb82f88 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/schema/TableMetadataPersistServiceTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/schema/TableMetaDataPersistServiceTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.mode.metadata.persist.service.config.schema;
import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereTable;
-import org.apache.shardingsphere.mode.metadata.persist.service.schema.TableMetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.persist.service.schema.TableMetaDataPersistService;
import org.apache.shardingsphere.mode.persist.PersistRepository;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -40,7 +40,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
-public final class TableMetadataPersistServiceTest {
+public final class TableMetaDataPersistServiceTest {
@Mock
private PersistRepository repository;
@@ -48,13 +48,13 @@ public final class TableMetadataPersistServiceTest {
@Test
public void assertPersist() {
ShardingSphereTable table = new ShardingSphereTable("foo_table", Collections.emptyList(), Collections.emptyList(), Collections.emptyList());
- new TableMetadataPersistService(repository).persist("foo_db", "foo_schema", Collections.singletonMap("foo_table", table));
+ new TableMetaDataPersistService(repository).persist("foo_db", "foo_schema", Collections.singletonMap("foo_table", table));
verify(repository).persist("/metadata/foo_db/schemas/foo_schema/tables/foo_table", "name: foo_table" + System.lineSeparator());
}
@Test
public void assertLoad() {
- TableMetadataPersistService tableMetaDataPersistService = new TableMetadataPersistService(repository);
+ TableMetaDataPersistService tableMetaDataPersistService = new TableMetaDataPersistService(repository);
when(repository.getChildrenKeys("/metadata/foo_db/schemas/foo_schema/tables")).thenReturn(Collections.singletonList("t_order"));
when(repository.getDirectly("/metadata/foo_db/schemas/foo_schema/tables/t_order")).thenReturn(readYAML());
Map<String, ShardingSphereTable> tables = tableMetaDataPersistService.load("foo_db", "foo_schema");
@@ -66,7 +66,7 @@ public final class TableMetadataPersistServiceTest {
@Test
public void assertDelete() {
- new TableMetadataPersistService(repository).delete("foo_db", "foo_schema", "foo_table");
+ new TableMetaDataPersistService(repository).delete("foo_db", "foo_schema", "foo_table");
verify(repository).delete("/metadata/foo_db/schemas/foo_schema/tables/foo_table");
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/schema/ViewMetadataPersistServiceTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/schema/ViewMetaDataPersistServiceTest.java
similarity index 89%
rename from mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/schema/ViewMetadataPersistServiceTest.java
rename to mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/schema/ViewMetaDataPersistServiceTest.java
index bf3c5fa32ac..10d85d7e5a1 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/schema/ViewMetadataPersistServiceTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/schema/ViewMetaDataPersistServiceTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.mode.metadata.persist.service.config.schema;
import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereView;
-import org.apache.shardingsphere.mode.metadata.persist.service.schema.ViewMetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.persist.service.schema.ViewMetaDataPersistService;
import org.apache.shardingsphere.mode.persist.PersistRepository;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -40,7 +40,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
-public final class ViewMetadataPersistServiceTest {
+public final class ViewMetaDataPersistServiceTest {
@Mock
private PersistRepository repository;
@@ -48,7 +48,7 @@ public final class ViewMetadataPersistServiceTest {
@Test
public void assertPersist() {
ShardingSphereView view = new ShardingSphereView("foo_view", "select `db`.`db`.`id` AS `id`,`db`.`db`.`order_id` AS `order_id` from `db`.`db`");
- new ViewMetadataPersistService(repository).persist("foo_db", "foo_schema", Collections.singletonMap("foo_view", view));
+ new ViewMetaDataPersistService(repository).persist("foo_db", "foo_schema", Collections.singletonMap("foo_view", view));
verify(repository).persist("/metadata/foo_db/schemas/foo_schema/views/foo_view", "name: foo_view" + System.lineSeparator()
+ "viewDefinition: select `db`.`db`.`id` AS `id`,`db`.`db`.`order_id` AS `order_id` from" + System.lineSeparator()
+ " `db`.`db`" + System.lineSeparator());
@@ -56,10 +56,10 @@ public final class ViewMetadataPersistServiceTest {
@Test
public void assertLoad() {
- ViewMetadataPersistService viewMetadataPersistService = new ViewMetadataPersistService(repository);
+ ViewMetaDataPersistService viewMetaDataPersistService = new ViewMetaDataPersistService(repository);
when(repository.getChildrenKeys("/metadata/foo_db/schemas/foo_schema/views")).thenReturn(Collections.singletonList("foo_view"));
when(repository.getDirectly("/metadata/foo_db/schemas/foo_schema/views/foo_view")).thenReturn(readYAML());
- Map<String, ShardingSphereView> views = viewMetadataPersistService.load("foo_db", "foo_schema");
+ Map<String, ShardingSphereView> views = viewMetaDataPersistService.load("foo_db", "foo_schema");
assertThat(views.size(), is(1));
assertThat(views.get("foo_view").getName(), is("foo_view"));
assertThat(views.get("foo_view").getViewDefinition(), is("select `db`.`db`.`id` AS `id`,`db`.`db`.`order_id` AS `order_id` from `db`.`db`"));
@@ -67,7 +67,7 @@ public final class ViewMetadataPersistServiceTest {
@Test
public void assertDelete() {
- new ViewMetadataPersistService(repository).delete("foo_db", "foo_schema", "foo_view");
+ new ViewMetaDataPersistService(repository).delete("foo_db", "foo_schema", "foo_view");
verify(repository).delete("/metadata/foo_db/schemas/foo_schema/views/foo_view");
}
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
index 953d64d236c..12b343b21b6 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
@@ -29,9 +29,9 @@ import org.apache.shardingsphere.mode.manager.ContextManagerBuilderParameter;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.RegistryCenter;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.workerid.generator.ClusterWorkerIdGenerator;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.subscriber.ContextManagerSubscriberFacade;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.MetadataContextsFactory;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContextsFactory;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryFactory;
@@ -47,7 +47,7 @@ public final class ClusterContextManagerBuilder implements ContextManagerBuilder
@Override
public ContextManager build(final ContextManagerBuilderParameter param) throws SQLException {
ClusterPersistRepository repository = ClusterPersistRepositoryFactory.getInstance((ClusterPersistRepositoryConfiguration) param.getModeConfiguration().getRepository());
- MetadataPersistService persistService = new MetadataPersistService(repository);
+ MetaDataPersistService persistService = new MetaDataPersistService(repository);
persistConfigurations(persistService, param);
RegistryCenter registryCenter = new RegistryCenter(repository, new EventBusContext(), param.getInstanceMetaData(), param.getDatabaseConfigs());
InstanceContext instanceContext = buildInstanceContext(registryCenter, param);
@@ -55,14 +55,14 @@ public final class ClusterContextManagerBuilder implements ContextManagerBuilder
if (persistRepository instanceof InstanceContextAware) {
((InstanceContextAware) persistRepository).setInstanceContext(instanceContext);
}
- MetadataContexts metadataContexts = MetadataContextsFactory.create(persistService, param, instanceContext, registryCenter.getStorageNodeStatusService().loadStorageNodes());
- persistMetadata(metadataContexts);
- ContextManager result = new ContextManager(metadataContexts, instanceContext);
+ MetaDataContexts metaDataContexts = MetaDataContextsFactory.create(persistService, param, instanceContext, registryCenter.getStorageNodeStatusService().loadStorageNodes());
+ persistMetaData(metaDataContexts);
+ ContextManager result = new ContextManager(metaDataContexts, instanceContext);
registerOnline(persistService, registryCenter, param, result);
return result;
}
- private void persistConfigurations(final MetadataPersistService persistService, final ContextManagerBuilderParameter param) {
+ private void persistConfigurations(final MetaDataPersistService persistService, final ContextManagerBuilderParameter param) {
if (!param.isEmpty()) {
persistService.persistConfigurations(param.getDatabaseConfigs(), param.getGlobalRuleConfigs(), param.getProps());
}
@@ -73,16 +73,16 @@ public final class ClusterContextManagerBuilder implements ContextManagerBuilder
param.getModeConfiguration(), new GlobalLockContext(registryCenter.getGlobalLockPersistService()), registryCenter.getEventBusContext());
}
- private void persistMetadata(final MetadataContexts metadataContexts) {
- metadataContexts.getMetadata().getDatabases().values().forEach(each -> each.getSchemas()
- .forEach((schemaName, schema) -> metadataContexts.getPersistService().getDatabaseMetadataService().persist(each.getName(), schemaName, schema)));
- for (Entry<String, ShardingSphereDatabaseData> entry : metadataContexts.getShardingSphereData().getDatabaseData().entrySet()) {
- entry.getValue().getSchemaData().forEach((schemaName, schemaData) -> metadataContexts.getPersistService().getShardingSphereDataPersistService()
- .persist(entry.getKey(), schemaName, schemaData, metadataContexts.getMetadata().getDatabases()));
+ private void persistMetaData(final MetaDataContexts metaDataContexts) {
+ metaDataContexts.getMetaData().getDatabases().values().forEach(each -> each.getSchemas()
+ .forEach((schemaName, schema) -> metaDataContexts.getPersistService().getDatabaseMetaDataService().persist(each.getName(), schemaName, schema)));
+ for (Entry<String, ShardingSphereDatabaseData> entry : metaDataContexts.getShardingSphereData().getDatabaseData().entrySet()) {
+ entry.getValue().getSchemaData().forEach((schemaName, schemaData) -> metaDataContexts.getPersistService().getShardingSphereDataPersistService()
+ .persist(entry.getKey(), schemaName, schemaData, metaDataContexts.getMetaData().getDatabases()));
}
}
- private void registerOnline(final MetadataPersistService persistService, final RegistryCenter registryCenter, final ContextManagerBuilderParameter param, final ContextManager contextManager) {
+ private void registerOnline(final MetaDataPersistService persistService, final RegistryCenter registryCenter, final ContextManagerBuilderParameter param, final ContextManager contextManager) {
contextManager.getInstanceContext().getInstance().setLabels(param.getLabels());
contextManager.getInstanceContext().getAllClusterInstances().addAll(registryCenter.getComputeNodeStatusService().loadAllComputeNodeInstances());
new ContextManagerSubscriberFacade(persistService, registryCenter, contextManager);
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/RegistryCenter.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/RegistryCenter.java
index 8fda25fb325..b3d9f56708b 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/RegistryCenter.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/RegistryCenter.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.instance.metadata.jdbc.JDBCInstanceMetaDa
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.GlobalLockPersistService;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.GovernanceWatcherFactory;
-import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.subscriber.SchemaMetadataRegistrySubscriber;
+import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.subscriber.SchemaMetaDataRegistrySubscriber;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.subscriber.ShardingSphereSchemaDataRegistrySubscriber;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.service.ComputeNodeStatusService;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.subscriber.ComputeNodeStatusSubscriber;
@@ -88,7 +88,7 @@ public final class RegistryCenter {
}
private void createSubscribers(final ClusterPersistRepository repository) {
- new SchemaMetadataRegistrySubscriber(repository, eventBusContext);
+ new SchemaMetaDataRegistrySubscriber(repository, eventBusContext);
new ComputeNodeStatusSubscriber(this, repository);
new StorageNodeStatusSubscriber(repository, eventBusContext);
new ProcessRegistrySubscriber(repository, eventBusContext);
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/schema/TableMetadataChangedEvent.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/schema/TableMetaDataChangedEvent.java
similarity index 89%
rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/schema/TableMetadataChangedEvent.java
rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/schema/TableMetaDataChangedEvent.java
index 1f0c2ee9c0d..2bf92118ab4 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/schema/TableMetadataChangedEvent.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/schema/TableMetaDataChangedEvent.java
@@ -23,17 +23,17 @@ import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.GovernanceEvent;
/**
- * Table Metadata changed event.
+ * Table meta data changed event.
*/
@RequiredArgsConstructor
@Getter
-public final class TableMetadataChangedEvent implements GovernanceEvent {
+public final class TableMetaDataChangedEvent implements GovernanceEvent {
private final String databaseName;
private final String schemaName;
- private final ShardingSphereTable changedTableMetadata;
+ private final ShardingSphereTable changedTableMetaData;
private final String deletedTable;
}
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/schema/ViewMetadataChangedEvent.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/schema/ViewMetaDataChangedEvent.java
similarity index 89%
rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/schema/ViewMetadataChangedEvent.java
rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/schema/ViewMetaDataChangedEvent.java
index 441798e2be7..11e3d10f6c0 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/schema/ViewMetadataChangedEvent.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/schema/ViewMetaDataChangedEvent.java
@@ -23,17 +23,17 @@ import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.GovernanceEvent;
/**
- * View Metadata changed event.
+ * View meta data changed event.
*/
@RequiredArgsConstructor
@Getter
-public final class ViewMetadataChangedEvent implements GovernanceEvent {
+public final class ViewMetaDataChangedEvent implements GovernanceEvent {
private final String databaseName;
private final String schemaName;
- private final ShardingSphereView changedViewMetadata;
+ private final ShardingSphereView changedViewMetaData;
private final String deletedView;
}
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/subscriber/SchemaMetadataRegistrySubscriber.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/subscriber/SchemaMetaDataRegistrySubscriber.java
similarity index 92%
rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/subscriber/SchemaMetadataRegistrySubscriber.java
rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/subscriber/SchemaMetaDataRegistrySubscriber.java
index 34f48256892..15368d06485 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/subscriber/SchemaMetadataRegistrySubscriber.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/subscriber/SchemaMetaDataRegistrySubscriber.java
@@ -26,27 +26,27 @@ import org.apache.shardingsphere.infra.metadata.database.schema.event.AlterSchem
import org.apache.shardingsphere.infra.metadata.database.schema.event.DropIndexEvent;
import org.apache.shardingsphere.infra.metadata.database.schema.event.DropSchemaEvent;
import org.apache.shardingsphere.infra.metadata.database.schema.event.SchemaAlteredEvent;
-import org.apache.shardingsphere.mode.metadata.persist.service.DatabaseMetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.persist.service.DatabaseMetaDataPersistService;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import java.util.Map;
import java.util.stream.Collectors;
/**
- * Schema Metadata registry subscriber.
+ * Schema meta data registry subscriber.
*/
@SuppressWarnings("UnstableApiUsage")
-public final class SchemaMetadataRegistrySubscriber {
+public final class SchemaMetaDataRegistrySubscriber {
- private final DatabaseMetadataPersistService persistService;
+ private final DatabaseMetaDataPersistService persistService;
- public SchemaMetadataRegistrySubscriber(final ClusterPersistRepository repository, final EventBusContext eventBusContext) {
- persistService = new DatabaseMetadataPersistService(repository);
+ public SchemaMetaDataRegistrySubscriber(final ClusterPersistRepository repository, final EventBusContext eventBusContext) {
+ persistService = new DatabaseMetaDataPersistService(repository);
eventBusContext.register(this);
}
/**
- * Update when Metadata altered.
+ * Update when meta data altered.
*
* @param event schema altered event
*/
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetadataChangedWatcher.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java
similarity index 81%
rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetadataChangedWatcher.java
rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java
index c4c907675cb..f67ef44c658 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetadataChangedWatcher.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java
@@ -34,14 +34,14 @@ import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.Gover
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.GovernanceWatcher;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.datasource.DataSourceChangedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.rule.RuleConfigurationsChangedEvent;
-import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema.TableMetadataChangedEvent;
-import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema.ViewMetadataChangedEvent;
+import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema.TableMetaDataChangedEvent;
+import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema.ViewMetaDataChangedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.version.DatabaseVersionChangedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.DatabaseAddedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.DatabaseDeletedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.SchemaAddedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.SchemaDeletedEvent;
-import org.apache.shardingsphere.mode.metadata.persist.node.DatabaseMetadataNode;
+import org.apache.shardingsphere.mode.metadata.persist.node.DatabaseMetaDataNode;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEvent;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEvent.Type;
@@ -57,14 +57,14 @@ import java.util.Optional;
import java.util.stream.Collectors;
/**
- * Metadata changed watcher.
+ * Meta data changed watcher.
*/
-public final class MetadataChangedWatcher implements GovernanceWatcher<GovernanceEvent> {
+public final class MetaDataChangedWatcher implements GovernanceWatcher<GovernanceEvent> {
@Override
public Collection<String> getWatchingKeys(final String databaseName) {
- return null == databaseName ? Collections.singleton(DatabaseMetadataNode.getMetadataNodePath())
- : Collections.singleton(DatabaseMetadataNode.getDatabaseNamePath(databaseName));
+ return null == databaseName ? Collections.singleton(DatabaseMetaDataNode.getMetaDataNodePath())
+ : Collections.singleton(DatabaseMetaDataNode.getDatabaseNamePath(databaseName));
}
@Override
@@ -80,31 +80,31 @@ public final class MetadataChangedWatcher implements GovernanceWatcher<Governanc
if (schemaChanged(event)) {
return createSchemaChangedEvent(event);
}
- if (schemaMetadataChanged(event)) {
- return createSchemaMetadataChangedEvent(event);
+ if (schemaMetaDataChanged(event)) {
+ return createSchemaMetaDataChangedEvent(event);
}
return createRuleAndDataSourceChangedEvent(event);
}
private boolean databaseChanged(final DataChangedEvent event) {
- return DatabaseMetadataNode.getDatabaseName(event.getKey()).isPresent();
+ return DatabaseMetaDataNode.getDatabaseName(event.getKey()).isPresent();
}
private boolean schemaChanged(final DataChangedEvent event) {
- return DatabaseMetadataNode.getDatabaseNameByDatabasePath(event.getKey()).isPresent() && DatabaseMetadataNode.getSchemaName(event.getKey()).isPresent();
+ return DatabaseMetaDataNode.getDatabaseNameByDatabasePath(event.getKey()).isPresent() && DatabaseMetaDataNode.getSchemaName(event.getKey()).isPresent();
}
- private boolean schemaMetadataChanged(final DataChangedEvent event) {
- Optional<String> databaseName = DatabaseMetadataNode.getDatabaseNameByDatabasePath(event.getKey());
- Optional<String> schemaName = DatabaseMetadataNode.getSchemaNameBySchemaPath(event.getKey());
- Optional<String> tableName = DatabaseMetadataNode.getTableName(event.getKey());
- Optional<String> viewName = DatabaseMetadataNode.getViewName(event.getKey());
+ private boolean schemaMetaDataChanged(final DataChangedEvent event) {
+ Optional<String> databaseName = DatabaseMetaDataNode.getDatabaseNameByDatabasePath(event.getKey());
+ Optional<String> schemaName = DatabaseMetaDataNode.getSchemaNameBySchemaPath(event.getKey());
+ Optional<String> tableName = DatabaseMetaDataNode.getTableName(event.getKey());
+ Optional<String> viewName = DatabaseMetaDataNode.getViewName(event.getKey());
return databaseName.isPresent() && schemaName.isPresent() && !Strings.isNullOrEmpty(event.getValue())
&& ((tableName.isPresent() && !SystemSchemaBuilderRule.isSystemTable(databaseName.get(), tableName.get()) || viewName.isPresent()));
}
private Optional<GovernanceEvent> createDatabaseChangedEvent(final DataChangedEvent event) {
- Optional<String> databaseName = DatabaseMetadataNode.getDatabaseName(event.getKey());
+ Optional<String> databaseName = DatabaseMetaDataNode.getDatabaseName(event.getKey());
Preconditions.checkState(databaseName.isPresent());
if (Type.ADDED == event.getType() || Type.UPDATED == event.getType()) {
return Optional.of(new DatabaseAddedEvent(databaseName.get()));
@@ -116,9 +116,9 @@ public final class MetadataChangedWatcher implements GovernanceWatcher<Governanc
}
private Optional<GovernanceEvent> createSchemaChangedEvent(final DataChangedEvent event) {
- Optional<String> databaseName = DatabaseMetadataNode.getDatabaseNameByDatabasePath(event.getKey());
+ Optional<String> databaseName = DatabaseMetaDataNode.getDatabaseNameByDatabasePath(event.getKey());
Preconditions.checkState(databaseName.isPresent());
- Optional<String> schemaName = DatabaseMetadataNode.getSchemaName(event.getKey());
+ Optional<String> schemaName = DatabaseMetaDataNode.getSchemaName(event.getKey());
Preconditions.checkState(schemaName.isPresent());
if (Type.ADDED == event.getType() || Type.UPDATED == event.getType()) {
return Optional.of(new SchemaAddedEvent(databaseName.get(), schemaName.get()));
@@ -130,18 +130,18 @@ public final class MetadataChangedWatcher implements GovernanceWatcher<Governanc
}
private Optional<GovernanceEvent> createRuleAndDataSourceChangedEvent(final DataChangedEvent event) {
- Optional<String> databaseName = DatabaseMetadataNode.getDatabaseNameByDatabasePath(event.getKey());
+ Optional<String> databaseName = DatabaseMetaDataNode.getDatabaseNameByDatabasePath(event.getKey());
if (!databaseName.isPresent() || Strings.isNullOrEmpty(event.getValue())) {
return Optional.empty();
}
- if (event.getType() == Type.UPDATED && event.getKey().equals(DatabaseMetadataNode.getActiveVersionPath(databaseName.get()))) {
+ if (event.getType() == Type.UPDATED && event.getKey().equals(DatabaseMetaDataNode.getActiveVersionPath(databaseName.get()))) {
return Optional.of(new DatabaseVersionChangedEvent(databaseName.get(), event.getValue()));
}
- Optional<String> databaseVersion = DatabaseMetadataNode.getVersionByDataSourcesPath(event.getKey());
+ Optional<String> databaseVersion = DatabaseMetaDataNode.getVersionByDataSourcesPath(event.getKey());
if (databaseVersion.isPresent() && event.getType() != Type.DELETED) {
return Optional.of(createDataSourceChangedEvent(databaseName.get(), databaseVersion.get(), event));
}
- databaseVersion = DatabaseMetadataNode.getVersionByRulesPath(event.getKey());
+ databaseVersion = DatabaseMetaDataNode.getVersionByRulesPath(event.getKey());
if (databaseVersion.isPresent() && event.getType() != Type.DELETED) {
return Optional.of(new RuleConfigurationsChangedEvent(databaseName.get(), databaseVersion.get(), getRuleConfigurations(event.getValue())));
}
@@ -164,25 +164,25 @@ public final class MetadataChangedWatcher implements GovernanceWatcher<Governanc
return new YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(rules);
}
- private Optional<GovernanceEvent> createSchemaMetadataChangedEvent(final DataChangedEvent event) {
- Optional<String> databaseName = DatabaseMetadataNode.getDatabaseNameByDatabasePath(event.getKey());
+ private Optional<GovernanceEvent> createSchemaMetaDataChangedEvent(final DataChangedEvent event) {
+ Optional<String> databaseName = DatabaseMetaDataNode.getDatabaseNameByDatabasePath(event.getKey());
Preconditions.checkState(databaseName.isPresent());
- Optional<String> schemaName = DatabaseMetadataNode.getSchemaNameBySchemaPath(event.getKey());
+ Optional<String> schemaName = DatabaseMetaDataNode.getSchemaNameBySchemaPath(event.getKey());
Preconditions.checkState(schemaName.isPresent());
- return Optional.of(createSchemaMetadataChangedEvent(event, databaseName.get(), schemaName.get()));
+ return Optional.of(createSchemaMetaDataChangedEvent(event, databaseName.get(), schemaName.get()));
}
- private GovernanceEvent createSchemaMetadataChangedEvent(final DataChangedEvent event, final String databaseName, final String schemaName) {
- Optional<String> tableName = DatabaseMetadataNode.getTableName(event.getKey());
- Optional<String> viewName = DatabaseMetadataNode.getViewName(event.getKey());
+ private GovernanceEvent createSchemaMetaDataChangedEvent(final DataChangedEvent event, final String databaseName, final String schemaName) {
+ Optional<String> tableName = DatabaseMetaDataNode.getTableName(event.getKey());
+ Optional<String> viewName = DatabaseMetaDataNode.getViewName(event.getKey());
Preconditions.checkState(tableName.isPresent() || viewName.isPresent());
if (tableName.isPresent()) {
return Type.DELETED == event.getType()
- ? new TableMetadataChangedEvent(databaseName, schemaName, null, tableName.get())
- : new TableMetadataChangedEvent(databaseName, schemaName, new YamlTableSwapper().swapToObject(YamlEngine.unmarshal(event.getValue(), YamlShardingSphereTable.class)), null);
+ ? new TableMetaDataChangedEvent(databaseName, schemaName, null, tableName.get())
+ : new TableMetaDataChangedEvent(databaseName, schemaName, new YamlTableSwapper().swapToObject(YamlEngine.unmarshal(event.getValue(), YamlShardingSphereTable.class)), null);
}
return Type.DELETED == event.getType()
- ? new ViewMetadataChangedEvent(databaseName, schemaName, null, viewName.get())
- : new ViewMetadataChangedEvent(databaseName, schemaName, new YamlViewSwapper().swapToObject(YamlEngine.unmarshal(event.getValue(), YamlShardingSphereView.class)), null);
+ ? new ViewMetaDataChangedEvent(databaseName, schemaName, null, viewName.get())
+ : new ViewMetaDataChangedEvent(databaseName, schemaName, new YamlViewSwapper().swapToObject(YamlEngine.unmarshal(event.getValue(), YamlShardingSphereView.class)), null);
}
}
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriber.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriber.java
index 3784f837017..b02dcea8072 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriber.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriber.java
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.confi
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.rule.GlobalRuleConfigurationsChangedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.rule.RuleConfigurationsChangedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.version.DatabaseVersionChangedEvent;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.metadata.storage.StorageNodeDataSource;
import org.apache.shardingsphere.mode.metadata.storage.StorageNodeStatus;
import org.apache.shardingsphere.mode.metadata.storage.event.StorageNodeDataSourceChangedEvent;
@@ -44,13 +44,13 @@ import java.util.stream.Collectors;
@SuppressWarnings("UnstableApiUsage")
public final class ConfigurationChangedSubscriber {
- private final MetadataPersistService persistService;
+ private final MetaDataPersistService persistService;
private final RegistryCenter registryCenter;
private final ContextManager contextManager;
- public ConfigurationChangedSubscriber(final MetadataPersistService persistService, final RegistryCenter registryCenter, final ContextManager contextManager) {
+ public ConfigurationChangedSubscriber(final MetaDataPersistService persistService, final RegistryCenter registryCenter, final ContextManager contextManager) {
this.persistService = persistService;
this.registryCenter = registryCenter;
this.contextManager = contextManager;
@@ -65,7 +65,7 @@ public final class ConfigurationChangedSubscriber {
*/
@Subscribe
public synchronized void renew(final DataSourceChangedEvent event) {
- if (persistService.getMetadataVersionPersistService().isActiveVersion(event.getDatabaseName(), event.getDatabaseVersion())) {
+ if (persistService.getMetaDataVersionPersistService().isActiveVersion(event.getDatabaseName(), event.getDatabaseVersion())) {
contextManager.alterDataSourceConfiguration(event.getDatabaseName(), event.getDataSourcePropertiesMap());
disableDataSources();
}
@@ -78,7 +78,7 @@ public final class ConfigurationChangedSubscriber {
*/
@Subscribe
public synchronized void renew(final RuleConfigurationsChangedEvent event) {
- if (persistService.getMetadataVersionPersistService().isActiveVersion(event.getDatabaseName(), event.getDatabaseVersion())) {
+ if (persistService.getMetaDataVersionPersistService().isActiveVersion(event.getDatabaseName(), event.getDatabaseVersion())) {
contextManager.alterRuleConfiguration(event.getDatabaseName(), event.getRuleConfigurations());
disableDataSources();
}
@@ -119,7 +119,7 @@ public final class ConfigurationChangedSubscriber {
}
private void disableDataSources() {
- contextManager.getMetadataContexts().getMetadata().getDatabases().forEach((key, value) -> value.getRuleMetaData().getRules().forEach(each -> {
+ contextManager.getMetaDataContexts().getMetaData().getDatabases().forEach((key, value) -> value.getRuleMetaData().getRules().forEach(each -> {
if (each instanceof StaticDataSourceContainedRule) {
disableDataSources((StaticDataSourceContainedRule) each);
}
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ContextManagerSubscriberFacade.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ContextManagerSubscriberFacade.java
index 446ecb514d1..783d4301ca5 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ContextManagerSubscriberFacade.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ContextManagerSubscriberFacade.java
@@ -19,16 +19,16 @@ package org.apache.shardingsphere.mode.manager.cluster.coordinator.subscriber;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.RegistryCenter;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
/**
* Context manager subscriber facade.
*/
public final class ContextManagerSubscriberFacade {
- public ContextManagerSubscriberFacade(final MetadataPersistService persistService, final RegistryCenter registryCenter, final ContextManager contextManager) {
+ public ContextManagerSubscriberFacade(final MetaDataPersistService persistService, final RegistryCenter registryCenter, final ContextManager contextManager) {
new ConfigurationChangedSubscriber(persistService, registryCenter, contextManager);
- new ResourceMetadataChangedSubscriber(contextManager);
+ new ResourceMetaDataChangedSubscriber(contextManager);
new DatabaseChangedSubscriber(contextManager);
new StateChangedSubscriber(registryCenter, contextManager);
new ProcessListChangedSubscriber(registryCenter, contextManager);
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetadataChangedSubscriber.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriber.java
similarity index 81%
rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetadataChangedSubscriber.java
rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriber.java
index d167c455ec8..340cb6ba862 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetadataChangedSubscriber.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriber.java
@@ -19,28 +19,28 @@ package org.apache.shardingsphere.mode.manager.cluster.coordinator.subscriber;
import com.google.common.eventbus.Subscribe;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema.TableMetadataChangedEvent;
-import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema.ViewMetadataChangedEvent;
+import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema.TableMetaDataChangedEvent;
+import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema.ViewMetaDataChangedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.DatabaseAddedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.DatabaseDeletedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.SchemaAddedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.SchemaDeletedEvent;
/**
- * Resource Metadata changed subscriber.
+ * Resource meta data changed subscriber.
*/
@SuppressWarnings("UnstableApiUsage")
-public final class ResourceMetadataChangedSubscriber {
+public final class ResourceMetaDataChangedSubscriber {
private final ContextManager contextManager;
- public ResourceMetadataChangedSubscriber(final ContextManager contextManager) {
+ public ResourceMetaDataChangedSubscriber(final ContextManager contextManager) {
this.contextManager = contextManager;
contextManager.getInstanceContext().getEventBusContext().register(this);
}
/**
- * Renew to persist Metadata.
+ * Renew to persist meta data.
*
* @param event database added event
*/
@@ -80,24 +80,24 @@ public final class ResourceMetadataChangedSubscriber {
}
/**
- * Renew Metadata of the table.
+ * Renew meta data of the table.
*
- * @param event table Metadata changed event
+ * @param event table meta data changed event
*/
@Subscribe
- public synchronized void renew(final TableMetadataChangedEvent event) {
- contextManager.alterSchema(event.getDatabaseName(), event.getSchemaName(), event.getChangedTableMetadata(), null);
+ public synchronized void renew(final TableMetaDataChangedEvent event) {
+ contextManager.alterSchema(event.getDatabaseName(), event.getSchemaName(), event.getChangedTableMetaData(), null);
contextManager.alterSchema(event.getDatabaseName(), event.getSchemaName(), event.getDeletedTable(), null);
}
/**
- * Renew Metadata of the view.
+ * Renew meta data of the view.
*
- * @param event view Metadata changed event
+ * @param event view meta data changed event
*/
@Subscribe
- public synchronized void renew(final ViewMetadataChangedEvent event) {
- contextManager.alterSchema(event.getDatabaseName(), event.getSchemaName(), null, event.getChangedViewMetadata());
+ public synchronized void renew(final ViewMetaDataChangedEvent event) {
+ contextManager.alterSchema(event.getDatabaseName(), event.getSchemaName(), null, event.getChangedViewMetaData());
contextManager.alterSchema(event.getDatabaseName(), event.getSchemaName(), null, event.getDeletedView());
}
}
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/StateChangedSubscriber.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/StateChangedSubscriber.java
index 3e3998831a3..20390036f02 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/StateChangedSubscriber.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/StateChangedSubscriber.java
@@ -63,16 +63,16 @@ public final class StateChangedSubscriber {
@Subscribe
public synchronized void renew(final StorageNodeChangedEvent event) {
QualifiedDatabase qualifiedDatabase = event.getQualifiedDatabase();
- if (!contextManager.getMetadataContexts().getMetadata().containsDatabase(event.getQualifiedDatabase().getDatabaseName())) {
+ if (!contextManager.getMetaDataContexts().getMetaData().containsDatabase(event.getQualifiedDatabase().getDatabaseName())) {
return;
}
- Optional<ShardingSphereRule> dynamicDataSourceRule = contextManager.getMetadataContexts().getMetadata().getDatabase(qualifiedDatabase.getDatabaseName()).getRuleMetaData()
+ Optional<ShardingSphereRule> dynamicDataSourceRule = contextManager.getMetaDataContexts().getMetaData().getDatabase(qualifiedDatabase.getDatabaseName()).getRuleMetaData()
.getRules().stream().filter(each -> each instanceof DynamicDataSourceContainedRule).findFirst();
if (dynamicDataSourceRule.isPresent()) {
((DynamicDataSourceContainedRule) dynamicDataSourceRule.get()).updateStatus(new StorageNodeDataSourceChangedEvent(qualifiedDatabase, event.getDataSource()));
return;
}
- Optional<ShardingSphereRule> staticDataSourceRule = contextManager.getMetadataContexts().getMetadata().getDatabase(qualifiedDatabase.getDatabaseName()).getRuleMetaData()
+ Optional<ShardingSphereRule> staticDataSourceRule = contextManager.getMetaDataContexts().getMetaData().getDatabase(qualifiedDatabase.getDatabaseName()).getRuleMetaData()
.getRules().stream().filter(each -> each instanceof StaticDataSourceContainedRule).findFirst();
staticDataSourceRule.ifPresent(optional -> ((StaticDataSourceContainedRule) optional)
.updateStatus(new StorageNodeDataSourceChangedEvent(qualifiedDatabase, event.getDataSource())));
@@ -87,11 +87,11 @@ public final class StateChangedSubscriber {
*/
@Subscribe
public synchronized void renew(final PrimaryStateChangedEvent event) {
- if (!contextManager.getMetadataContexts().getMetadata().containsDatabase(event.getQualifiedDatabase().getDatabaseName())) {
+ if (!contextManager.getMetaDataContexts().getMetaData().containsDatabase(event.getQualifiedDatabase().getDatabaseName())) {
return;
}
QualifiedDatabase qualifiedDatabase = event.getQualifiedDatabase();
- contextManager.getMetadataContexts().getMetadata().getDatabase(qualifiedDatabase.getDatabaseName()).getRuleMetaData().getRules()
+ contextManager.getMetaDataContexts().getMetaData().getDatabase(qualifiedDatabase.getDatabaseName()).getRuleMetaData().getRules()
.stream()
.filter(each -> each instanceof DynamicDataSourceContainedRule)
.forEach(each -> ((DynamicDataSourceContainedRule) each)
diff --git a/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.GovernanceWatcher b/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.GovernanceWatcher
index b2403124fea..10a83bdd843 100644
--- a/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.GovernanceWatcher
+++ b/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.GovernanceWatcher
@@ -16,7 +16,7 @@
#
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.storage.watcher.StorageNodeStateChangedWatcher
-org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.watcher.MetadataChangedWatcher
+org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.watcher.MetaDataChangedWatcher
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.watcher.GlobalRuleChangedWatcher
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.watcher.PropertiesChangedWatcher
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.watcher.ComputeNodeStateChangedWatcher
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/subscriber/SchemaMetadataRegistrySubscriberTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/subscriber/SchemaMetaDataRegistrySubscriberTest.java
similarity index 90%
rename from mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/subscriber/SchemaMetadataRegistrySubscriberTest.java
rename to mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/subscriber/SchemaMetaDataRegistrySubscriberTest.java
index bf67cc6f84f..364221be5de 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/subscriber/SchemaMetadataRegistrySubscriberTest.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/subscriber/SchemaMetaDataRegistrySubscriberTest.java
@@ -24,9 +24,9 @@ import org.apache.shardingsphere.infra.metadata.database.schema.event.AddSchemaE
import org.apache.shardingsphere.infra.metadata.database.schema.event.AlterSchemaEvent;
import org.apache.shardingsphere.infra.metadata.database.schema.event.DropSchemaEvent;
import org.apache.shardingsphere.infra.metadata.database.schema.event.SchemaAlteredEvent;
-import org.apache.shardingsphere.mode.metadata.persist.service.DatabaseMetadataPersistService;
-import org.apache.shardingsphere.mode.metadata.persist.service.schema.TableMetadataPersistService;
-import org.apache.shardingsphere.mode.metadata.persist.service.schema.ViewMetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.persist.service.DatabaseMetaDataPersistService;
+import org.apache.shardingsphere.mode.metadata.persist.service.schema.TableMetaDataPersistService;
+import org.apache.shardingsphere.mode.metadata.persist.service.schema.ViewMetaDataPersistService;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.junit.Before;
import org.junit.Test;
@@ -44,16 +44,16 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
-public final class SchemaMetadataRegistrySubscriberTest {
+public final class SchemaMetaDataRegistrySubscriberTest {
@Mock
- private DatabaseMetadataPersistService persistService;
+ private DatabaseMetaDataPersistService persistService;
- private SchemaMetadataRegistrySubscriber schemaMetaDataRegistrySubscriber;
+ private SchemaMetaDataRegistrySubscriber schemaMetaDataRegistrySubscriber;
@Before
public void setUp() throws ReflectiveOperationException {
- schemaMetaDataRegistrySubscriber = new SchemaMetadataRegistrySubscriber(mock(ClusterPersistRepository.class), new EventBusContext());
+ schemaMetaDataRegistrySubscriber = new SchemaMetaDataRegistrySubscriber(mock(ClusterPersistRepository.class), new EventBusContext());
Field field = schemaMetaDataRegistrySubscriber.getClass().getDeclaredField("persistService");
field.setAccessible(true);
field.set(schemaMetaDataRegistrySubscriber, persistService);
@@ -61,8 +61,8 @@ public final class SchemaMetadataRegistrySubscriberTest {
@Test
public void assertUpdateWithMetaDataAlteredEvent() {
- when(persistService.getTableMetaDataPersistService()).thenReturn(mock(TableMetadataPersistService.class));
- when(persistService.getViewMetaDataPersistService()).thenReturn(mock(ViewMetadataPersistService.class));
+ when(persistService.getTableMetaDataPersistService()).thenReturn(mock(TableMetaDataPersistService.class));
+ when(persistService.getViewMetaDataPersistService()).thenReturn(mock(ViewMetaDataPersistService.class));
SchemaAlteredEvent event = new SchemaAlteredEvent("foo_db", "foo_schema");
ShardingSphereTable table = new ShardingSphereTable();
event.getAlteredTables().add(table);
@@ -89,7 +89,7 @@ public final class SchemaMetadataRegistrySubscriberTest {
@Test
public void assertAlterSchemaEventWhenContainsTable() {
- when(persistService.getViewMetaDataPersistService()).thenReturn(mock(ViewMetadataPersistService.class));
+ when(persistService.getViewMetaDataPersistService()).thenReturn(mock(ViewMetaDataPersistService.class));
ShardingSphereSchema schema = new ShardingSphereSchema(Collections.singletonMap("t_order", new ShardingSphereTable()), Collections.emptyMap());
AlterSchemaEvent event = new AlterSchemaEvent("foo_db", "foo_schema", "new_foo_schema", schema);
schemaMetaDataRegistrySubscriber.alterSchema(event);
@@ -99,7 +99,7 @@ public final class SchemaMetadataRegistrySubscriberTest {
@Test
public void assertAlterSchemaEventWhenNotContainsTable() {
- when(persistService.getViewMetaDataPersistService()).thenReturn(mock(ViewMetadataPersistService.class));
+ when(persistService.getViewMetaDataPersistService()).thenReturn(mock(ViewMetaDataPersistService.class));
ShardingSphereSchema schema = new ShardingSphereSchema();
AlterSchemaEvent event = new AlterSchemaEvent("foo_db", "foo_schema", "new_foo_schema", schema);
schemaMetaDataRegistrySubscriber.alterSchema(event);
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetadataChangedWatcherTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcherTest.java
similarity index 95%
rename from mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetadataChangedWatcherTest.java
rename to mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcherTest.java
index 941b3468004..ee4eda33bd3 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetadataChangedWatcherTest.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcherTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.watcher;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.GovernanceEvent;
-import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema.TableMetadataChangedEvent;
+import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema.TableMetaDataChangedEvent;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEvent;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEvent.Type;
import org.junit.Test;
@@ -30,7 +30,7 @@ import static org.junit.Assert.assertFalse;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
-public final class MetadataChangedWatcherTest {
+public final class MetaDataChangedWatcherTest {
@Test
public void assertCreateEventWithInvalidPath() {
@@ -115,7 +115,7 @@ public final class MetadataChangedWatcherTest {
String key = "/metadata/sharding_db/schemas/sharding_schema/tables/t_order";
Optional<GovernanceEvent> actual = createEvent(key, "{}", Type.DELETED);
assertTrue(actual.isPresent());
- assertThat(((TableMetadataChangedEvent) actual.get()).getDeletedTable(), is("t_order"));
+ assertThat(((TableMetaDataChangedEvent) actual.get()).getDeletedTable(), is("t_order"));
}
@Test
@@ -134,6 +134,6 @@ public final class MetadataChangedWatcherTest {
private Optional<GovernanceEvent> createEvent(final String key, final String value, final Type type) {
DataChangedEvent dataChangedEvent = new DataChangedEvent(key, value, type);
- return new MetadataChangedWatcher().createGovernanceEvent(dataChangedEvent);
+ return new MetaDataChangedWatcher().createGovernanceEvent(dataChangedEvent);
}
}
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriberTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriberTest.java
index 5d20aac3cd3..836f6ce237d 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriberTest.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriberTest.java
@@ -46,8 +46,8 @@ import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.confi
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.rule.GlobalRuleConfigurationsChangedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.rule.RuleConfigurationsChangedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.version.DatabaseVersionChangedEvent;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
import org.apache.shardingsphere.sqltranslator.rule.SQLTranslatorRule;
@@ -85,7 +85,7 @@ public final class ConfigurationChangedSubscriberTest {
private ContextManager contextManager;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private MetadataPersistService persistService;
+ private MetaDataPersistService persistService;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private ShardingSphereDatabase database;
@@ -96,8 +96,8 @@ public final class ConfigurationChangedSubscriberTest {
@Before
public void setUp() throws SQLException {
contextManager = new ClusterContextManagerBuilder().build(createContextManagerBuilderParameter());
- contextManager.renewMetadataContexts(new MetadataContexts(contextManager.getMetadataContexts().getPersistService(), new ShardingSphereMetaData(createDatabases(),
- contextManager.getMetadataContexts().getMetadata().getGlobalRuleMetaData(), new ConfigurationProperties(new Properties()))));
+ contextManager.renewMetaDataContexts(new MetaDataContexts(contextManager.getMetaDataContexts().getPersistService(), new ShardingSphereMetaData(createDatabases(),
+ contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData(), new ConfigurationProperties(new Properties()))));
subscriber = new ConfigurationChangedSubscriber(persistService, new RegistryCenter(mock(ClusterPersistRepository.class),
new EventBusContext(), mock(ProxyInstanceMetaData.class), null), contextManager);
}
@@ -125,17 +125,17 @@ public final class ConfigurationChangedSubscriberTest {
@Test
public void assertRenewForRuleConfigurationsChanged() {
- when(persistService.getMetadataVersionPersistService().isActiveVersion("db", "0")).thenReturn(true);
- assertThat(contextManager.getMetadataContexts().getMetadata().getDatabase("db"), is(database));
+ when(persistService.getMetaDataVersionPersistService().isActiveVersion("db", "0")).thenReturn(true);
+ assertThat(contextManager.getMetaDataContexts().getMetaData().getDatabase("db"), is(database));
subscriber.renew(new RuleConfigurationsChangedEvent("db", "0", Collections.emptyList()));
- assertThat(contextManager.getMetadataContexts().getMetadata().getDatabase("db"), not(database));
+ assertThat(contextManager.getMetaDataContexts().getMetaData().getDatabase("db"), not(database));
}
@Test
public void assertRenewForDataSourceChanged() {
- when(persistService.getMetadataVersionPersistService().isActiveVersion("db", "0")).thenReturn(true);
+ when(persistService.getMetaDataVersionPersistService().isActiveVersion("db", "0")).thenReturn(true);
subscriber.renew(new DataSourceChangedEvent("db", "0", createChangedDataSourcePropertiesMap()));
- assertTrue(contextManager.getMetadataContexts().getMetadata().getDatabase("db").getResourceMetaData().getDataSources().containsKey("ds_2"));
+ assertTrue(contextManager.getMetaDataContexts().getMetaData().getDatabase("db").getResourceMetaData().getDataSources().containsKey("ds_2"));
}
private Map<String, DataSourceProperties> createChangedDataSourcePropertiesMap() {
@@ -151,11 +151,11 @@ public final class ConfigurationChangedSubscriberTest {
public void assertRenewForGlobalRuleConfigurationsChanged() {
GlobalRuleConfigurationsChangedEvent event = new GlobalRuleConfigurationsChangedEvent(getChangedGlobalRuleConfigurations());
subscriber.renew(event);
- assertThat(contextManager.getMetadataContexts().getMetadata().getGlobalRuleMetaData(), not(globalRuleMetaData));
- assertThat(contextManager.getMetadataContexts().getMetadata().getGlobalRuleMetaData().getRules().size(), is(3));
- assertThat(contextManager.getMetadataContexts().getMetadata().getGlobalRuleMetaData().getRules().stream().filter(each -> each instanceof AuthorityRule).count(), is(1L));
- assertThat(contextManager.getMetadataContexts().getMetadata().getGlobalRuleMetaData().getRules().stream().filter(each -> each instanceof TransactionRule).count(), is(1L));
- assertThat(contextManager.getMetadataContexts().getMetadata().getGlobalRuleMetaData().getRules().stream().filter(each -> each instanceof SQLTranslatorRule).count(), is(1L));
+ assertThat(contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData(), not(globalRuleMetaData));
+ assertThat(contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules().size(), is(3));
+ assertThat(contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules().stream().filter(each -> each instanceof AuthorityRule).count(), is(1L));
+ assertThat(contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules().stream().filter(each -> each instanceof TransactionRule).count(), is(1L));
+ assertThat(contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules().stream().filter(each -> each instanceof SQLTranslatorRule).count(), is(1L));
}
private Collection<RuleConfiguration> getChangedGlobalRuleConfigurations() {
@@ -188,14 +188,14 @@ public final class ConfigurationChangedSubscriberTest {
Properties props = new Properties();
props.setProperty(ConfigurationPropertyKey.SQL_SHOW.getKey(), Boolean.TRUE.toString());
subscriber.renew(new PropertiesChangedEvent(props));
- assertThat(contextManager.getMetadataContexts().getMetadata().getProps().getProps().getProperty(ConfigurationPropertyKey.SQL_SHOW.getKey()), is(Boolean.TRUE.toString()));
+ assertThat(contextManager.getMetaDataContexts().getMetaData().getProps().getProps().getProperty(ConfigurationPropertyKey.SQL_SHOW.getKey()), is(Boolean.TRUE.toString()));
}
private Map<String, DataSource> initContextManager() {
Map<String, DataSource> result = getDataSourceMap();
ShardingSphereResourceMetaData resourceMetaData = new ShardingSphereResourceMetaData("sharding_db", result);
ShardingSphereDatabase database = new ShardingSphereDatabase("db", new MySQLDatabaseType(), resourceMetaData, mock(ShardingSphereRuleMetaData.class), Collections.emptyMap());
- contextManager.getMetadataContexts().getMetadata().getDatabases().put("db", database);
+ contextManager.getMetaDataContexts().getMetaData().getDatabases().put("db", database);
return result;
}
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriberTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriberTest.java
index 85138128d1f..d6876b4cc60 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriberTest.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriberTest.java
@@ -36,7 +36,7 @@ import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.statu
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.ShowProcessListTriggerEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.ShowProcessListUnitCompleteEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.util.ReflectionUtil;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.mode.process.ShowProcessListManager;
import org.apache.shardingsphere.mode.process.lock.ShowProcessListSimpleLock;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
@@ -75,8 +75,8 @@ public final class ProcessListChangedSubscriberTest {
@Before
public void setUp() throws SQLException {
contextManager = new ClusterContextManagerBuilder().build(createContextManagerBuilderParameter());
- contextManager.renewMetadataContexts(new MetadataContexts(contextManager.getMetadataContexts().getPersistService(), new ShardingSphereMetaData(createDatabases(),
- contextManager.getMetadataContexts().getMetadata().getGlobalRuleMetaData(), new ConfigurationProperties(new Properties()))));
+ contextManager.renewMetaDataContexts(new MetaDataContexts(contextManager.getMetaDataContexts().getPersistService(), new ShardingSphereMetaData(createDatabases(),
+ contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData(), new ConfigurationProperties(new Properties()))));
subscriber = new ProcessListChangedSubscriber(new RegistryCenter(mock(ClusterPersistRepository.class), new EventBusContext(), mock(ProxyInstanceMetaData.class), null), contextManager);
}
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetadataChangedSubscriberTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriberTest.java
similarity index 80%
rename from mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetadataChangedSubscriberTest.java
rename to mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriberTest.java
index 9c5b1b87d16..c1777e19543 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetadataChangedSubscriberTest.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriberTest.java
@@ -33,14 +33,14 @@ import org.apache.shardingsphere.infra.rule.identifier.type.ResourceHeldRule;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.manager.ContextManagerBuilderParameter;
import org.apache.shardingsphere.mode.manager.cluster.ClusterContextManagerBuilder;
-import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema.TableMetadataChangedEvent;
-import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema.ViewMetadataChangedEvent;
+import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema.TableMetaDataChangedEvent;
+import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema.ViewMetaDataChangedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.DatabaseAddedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.DatabaseDeletedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.SchemaAddedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.SchemaDeletedEvent;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Before;
@@ -66,14 +66,14 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
-public final class ResourceMetadataChangedSubscriberTest {
+public final class ResourceMetaDataChangedSubscriberTest {
- private ResourceMetadataChangedSubscriber subscriber;
+ private ResourceMetaDataChangedSubscriber subscriber;
private ContextManager contextManager;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private MetadataPersistService persistService;
+ private MetaDataPersistService persistService;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private ShardingSphereDatabase database;
@@ -81,9 +81,9 @@ public final class ResourceMetadataChangedSubscriberTest {
@Before
public void setUp() throws SQLException {
contextManager = new ClusterContextManagerBuilder().build(createContextManagerBuilderParameter());
- contextManager.renewMetadataContexts(new MetadataContexts(contextManager.getMetadataContexts().getPersistService(), new ShardingSphereMetaData(createDatabases(),
- contextManager.getMetadataContexts().getMetadata().getGlobalRuleMetaData(), new ConfigurationProperties(new Properties()))));
- subscriber = new ResourceMetadataChangedSubscriber(contextManager);
+ contextManager.renewMetaDataContexts(new MetaDataContexts(contextManager.getMetaDataContexts().getPersistService(), new ShardingSphereMetaData(createDatabases(),
+ contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData(), new ConfigurationProperties(new Properties()))));
+ subscriber = new ResourceMetaDataChangedSubscriber(contextManager);
}
private ContextManagerBuilderParameter createContextManagerBuilderParameter() {
@@ -112,7 +112,7 @@ public final class ResourceMetadataChangedSubscriberTest {
when(persistService.getDataSourceService().load("db_added")).thenReturn(createDataSourcePropertiesMap());
when(persistService.getDatabaseRulePersistService().load("db_added")).thenReturn(Collections.emptyList());
subscriber.renew(new DatabaseAddedEvent("db_added"));
- assertNotNull(contextManager.getMetadataContexts().getMetadata().getDatabase("db_added").getResourceMetaData().getDataSources());
+ assertNotNull(contextManager.getMetaDataContexts().getMetaData().getDatabase("db_added").getResourceMetaData().getDataSources());
}
private Map<String, DataSourceProperties> createDataSourcePropertiesMap() {
@@ -127,37 +127,37 @@ public final class ResourceMetadataChangedSubscriberTest {
@Test
public void assertRenewForDatabaseDeleted() {
subscriber.renew(new DatabaseDeletedEvent("db"));
- assertNull(contextManager.getMetadataContexts().getMetadata().getDatabase("db"));
+ assertNull(contextManager.getMetaDataContexts().getMetaData().getDatabase("db"));
}
@Test
public void assertRenewForSchemaAdded() {
subscriber.renew(new SchemaAddedEvent("db", "foo_schema"));
- verify(contextManager.getMetadataContexts().getMetadata().getDatabase("db")).putSchema(argThat(argument -> argument.equals("foo_schema")), any(ShardingSphereSchema.class));
+ verify(contextManager.getMetaDataContexts().getMetaData().getDatabase("db")).putSchema(argThat(argument -> argument.equals("foo_schema")), any(ShardingSphereSchema.class));
}
@Test
public void assertRenewForSchemaDeleted() {
- when(contextManager.getMetadataContexts().getMetadata().getDatabase("db").containsSchema("foo_schema")).thenReturn(true);
+ when(contextManager.getMetaDataContexts().getMetaData().getDatabase("db").containsSchema("foo_schema")).thenReturn(true);
subscriber.renew(new SchemaDeletedEvent("db", "foo_schema"));
- verify(contextManager.getMetadataContexts().getMetadata().getDatabase("db")).removeSchema("foo_schema");
+ verify(contextManager.getMetaDataContexts().getMetaData().getDatabase("db")).removeSchema("foo_schema");
}
@Test
- public void assertRenewForTableMetadataChangedChanged() {
- when(contextManager.getMetadataContexts().getMetadata().getDatabase("db").containsSchema("db")).thenReturn(true);
- ShardingSphereTable changedTableMetadata = new ShardingSphereTable("t_order", Collections.emptyList(), Collections.emptyList(), Collections.emptyList());
- TableMetadataChangedEvent event = new TableMetadataChangedEvent("db", "db", changedTableMetadata, null);
+ public void assertRenewForTableMetaDataChangedChanged() {
+ when(contextManager.getMetaDataContexts().getMetaData().getDatabase("db").containsSchema("db")).thenReturn(true);
+ ShardingSphereTable changedTableMetaData = new ShardingSphereTable("t_order", Collections.emptyList(), Collections.emptyList(), Collections.emptyList());
+ TableMetaDataChangedEvent event = new TableMetaDataChangedEvent("db", "db", changedTableMetaData, null);
subscriber.renew(event);
- verify(contextManager.getMetadataContexts().getMetadata().getDatabase("db").getSchema("db")).putTable("t_order", event.getChangedTableMetadata());
+ verify(contextManager.getMetaDataContexts().getMetaData().getDatabase("db").getSchema("db")).putTable("t_order", event.getChangedTableMetaData());
}
@Test
- public void assertRenewForViewMetadataChanged() {
- when(contextManager.getMetadataContexts().getMetadata().getDatabase("db").containsSchema("db")).thenReturn(true);
- ShardingSphereView changedViewMetadata = new ShardingSphereView("t_order_view", "");
- ViewMetadataChangedEvent event = new ViewMetadataChangedEvent("db", "db", changedViewMetadata, null);
+ public void assertRenewForViewMetaDataChanged() {
+ when(contextManager.getMetaDataContexts().getMetaData().getDatabase("db").containsSchema("db")).thenReturn(true);
+ ShardingSphereView changedViewMetaData = new ShardingSphereView("t_order_view", "");
+ ViewMetaDataChangedEvent event = new ViewMetaDataChangedEvent("db", "db", changedViewMetaData, null);
subscriber.renew(event);
- verify(contextManager.getMetadataContexts().getMetadata().getDatabase("db").getSchema("db")).putView("t_order_view", event.getChangedViewMetadata());
+ verify(contextManager.getMetaDataContexts().getMetaData().getDatabase("db").getSchema("db")).putView("t_order_view", event.getChangedViewMetaData());
}
}
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/StateChangedSubscriberTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/StateChangedSubscriberTest.java
index b77c9540fb0..dbe8752829b 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/StateChangedSubscriberTest.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/StateChangedSubscriberTest.java
@@ -45,7 +45,7 @@ import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.statu
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.WorkerIdEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.storage.event.PrimaryStateChangedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.storage.event.StorageNodeChangedEvent;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.mode.metadata.storage.StorageNodeDataSource;
import org.apache.shardingsphere.mode.metadata.storage.StorageNodeRole;
import org.apache.shardingsphere.mode.metadata.storage.StorageNodeStatus;
@@ -90,8 +90,8 @@ public final class StateChangedSubscriberTest {
@Before
public void setUp() throws SQLException {
contextManager = new ClusterContextManagerBuilder().build(createContextManagerBuilderParameter());
- contextManager.renewMetadataContexts(new MetadataContexts(contextManager.getMetadataContexts().getPersistService(), new ShardingSphereMetaData(createDatabases(),
- contextManager.getMetadataContexts().getMetadata().getGlobalRuleMetaData(), new ConfigurationProperties(new Properties()))));
+ contextManager.renewMetaDataContexts(new MetaDataContexts(contextManager.getMetaDataContexts().getPersistService(), new ShardingSphereMetaData(createDatabases(),
+ contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData(), new ConfigurationProperties(new Properties()))));
subscriber = new StateChangedSubscriber(new RegistryCenter(mock(ClusterPersistRepository.class),
new EventBusContext(), mock(ProxyInstanceMetaData.class), null), contextManager);
}
@@ -135,7 +135,7 @@ public final class StateChangedSubscriberTest {
ShardingSphereRuleMetaData ruleMetaData = new ShardingSphereRuleMetaData(rules);
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class);
when(database.getRuleMetaData()).thenReturn(ruleMetaData);
- contextManager.getMetadataContexts().getMetadata().getDatabases().put("db", database);
+ contextManager.getMetaDataContexts().getMetaData().getDatabases().put("db", database);
PrimaryStateChangedEvent mockPrimaryStateChangedEvent = new PrimaryStateChangedEvent(new QualifiedDatabase("db.readwrite_ds.test_ds"));
subscriber.renew(mockPrimaryStateChangedEvent);
verify(dynamicDataSourceRule).restartHeartBeatJob(any());
diff --git a/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java b/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java
index 929cc3bee72..708ab1438b7 100644
--- a/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java
+++ b/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java
@@ -39,7 +39,7 @@ import org.apache.shardingsphere.mode.repository.cluster.nacos.entity.ServiceMet
import org.apache.shardingsphere.mode.repository.cluster.nacos.listener.NamingEventListener;
import org.apache.shardingsphere.mode.repository.cluster.nacos.props.NacosProperties;
import org.apache.shardingsphere.mode.repository.cluster.nacos.props.NacosPropertyKey;
-import org.apache.shardingsphere.mode.repository.cluster.nacos.utils.NacosMetadataUtil;
+import org.apache.shardingsphere.mode.repository.cluster.nacos.utils.NacosMetaDataUtil;
import java.util.Collection;
import java.util.Comparator;
@@ -152,9 +152,9 @@ public final class NacosRepository implements ClusterPersistRepository {
public String getDirectly(final String key) {
try {
for (ServiceMetadata each : serviceController.getAllServices()) {
- Optional<Instance> instance = findExistedInstance(key, each.isEphemeral()).stream().max(Comparator.comparing(NacosMetadataUtil::getTimestamp));
+ Optional<Instance> instance = findExistedInstance(key, each.isEphemeral()).stream().max(Comparator.comparing(NacosMetaDataUtil::getTimestamp));
if (instance.isPresent()) {
- return NacosMetadataUtil.getValue(instance.get());
+ return NacosMetaDataUtil.getValue(instance.get());
}
}
return null;
@@ -170,7 +170,7 @@ public final class NacosRepository implements ClusterPersistRepository {
for (ServiceMetadata each : serviceController.getAllServices()) {
Stream<String> keys = findExistedInstance(each.isEphemeral()).stream()
.map(instance -> {
- String fullPath = NacosMetadataUtil.getKey(instance);
+ String fullPath = NacosMetaDataUtil.getKey(instance);
if (fullPath.startsWith(key + PATH_SEPARATOR)) {
String pathWithoutPrefix = fullPath.substring((key + PATH_SEPARATOR).length());
return pathWithoutPrefix.contains(PATH_SEPARATOR) ? pathWithoutPrefix.substring(0, pathWithoutPrefix.indexOf(PATH_SEPARATOR)) : pathWithoutPrefix;
@@ -194,7 +194,7 @@ public final class NacosRepository implements ClusterPersistRepository {
public void persist(final String key, final String value) {
try {
Preconditions.checkNotNull(value, "Value can not be null");
- Optional<Instance> instance = findExistedInstance(key, false).stream().max(Comparator.comparing(NacosMetadataUtil::getTimestamp));
+ Optional<Instance> instance = findExistedInstance(key, false).stream().max(Comparator.comparing(NacosMetaDataUtil::getTimestamp));
if (instance.isPresent()) {
update(instance.get(), value);
} else {
@@ -212,9 +212,9 @@ public final class NacosRepository implements ClusterPersistRepository {
private void update(final Instance instance, final String value) throws NacosException {
Map<String, String> metadataMap = instance.getMetadata();
- String key = NacosMetadataUtil.getKey(instance);
+ String key = NacosMetaDataUtil.getKey(instance);
metadataMap.put(key, value);
- metadataMap.put(NacosMetadataUtil.UTC_ZONE_OFFSET.toString(), String.valueOf(NacosMetadataUtil.getTimestamp()));
+ metadataMap.put(NacosMetaDataUtil.UTC_ZONE_OFFSET.toString(), String.valueOf(NacosMetaDataUtil.getTimestamp()));
instance.setMetadata(metadataMap);
ServiceMetadata persistentService = serviceController.getPersistentService();
client.registerInstance(persistentService.getServiceName(), instance);
@@ -235,7 +235,7 @@ public final class NacosRepository implements ClusterPersistRepository {
fillEphemeralMetadata(metadataMap);
}
metadataMap.put(key, value);
- metadataMap.put(NacosMetadataUtil.UTC_ZONE_OFFSET.toString(), String.valueOf(NacosMetadataUtil.getTimestamp()));
+ metadataMap.put(NacosMetaDataUtil.UTC_ZONE_OFFSET.toString(), String.valueOf(NacosMetaDataUtil.getTimestamp()));
instance.setMetadata(metadataMap);
client.registerInstance(serviceMetadata.getServiceName(), instance);
keyValues.add(new KeyValue(key, value, ephemeral));
@@ -265,7 +265,7 @@ public final class NacosRepository implements ClusterPersistRepository {
instance.setEphemeral(false);
Map<String, String> metadataMap = new HashMap<>(2, 1);
metadataMap.put(key, "");
- metadataMap.put(NacosMetadataUtil.UTC_ZONE_OFFSET.toString(), String.valueOf(NacosMetadataUtil.getTimestamp()));
+ metadataMap.put(NacosMetaDataUtil.UTC_ZONE_OFFSET.toString(), String.valueOf(NacosMetaDataUtil.getTimestamp()));
instance.setMetadata(metadataMap);
client.registerInstance(persistentService.getServiceName(), instance);
result.add(new KeyValue(key, "", false));
@@ -286,14 +286,14 @@ public final class NacosRepository implements ClusterPersistRepository {
for (ServiceMetadata each : serviceController.getAllServices()) {
Collection<Instance> instances = findExistedInstance(each.isEphemeral()).stream()
.filter(instance -> {
- String fullPath = NacosMetadataUtil.getKey(instance);
+ String fullPath = NacosMetaDataUtil.getKey(instance);
return fullPath.startsWith(key + PATH_SEPARATOR) || StringUtils.equals(fullPath, key);
})
- .sorted(Comparator.comparing(NacosMetadataUtil::getKey).reversed()).collect(Collectors.toList());
+ .sorted(Comparator.comparing(NacosMetaDataUtil::getKey).reversed()).collect(Collectors.toList());
Collection<KeyValue> keyValues = new LinkedList<>();
for (Instance instance : instances) {
client.deregisterInstance(each.getServiceName(), instance);
- keyValues.add(new KeyValue(NacosMetadataUtil.getKey(instance), null, each.isEphemeral()));
+ keyValues.add(new KeyValue(NacosMetaDataUtil.getKey(instance), null, each.isEphemeral()));
}
waitValue(keyValues);
}
@@ -304,7 +304,7 @@ public final class NacosRepository implements ClusterPersistRepository {
private Collection<Instance> findExistedInstance(final String key, final boolean ephemeral) throws NacosException {
return client.getAllInstances(serviceController.getService(ephemeral).getServiceName(), false).stream()
- .filter(each -> Objects.equals(key, NacosMetadataUtil.getKey(each))).collect(Collectors.toList());
+ .filter(each -> Objects.equals(key, NacosMetaDataUtil.getKey(each))).collect(Collectors.toList());
}
private Collection<Instance> findExistedInstance(final boolean ephemeral) throws NacosException {
@@ -330,11 +330,11 @@ public final class NacosRepository implements ClusterPersistRepository {
Map<Boolean, List<KeyValue>> keyValueMap = keyValues.stream().collect(Collectors.groupingBy(KeyValue::isEphemeral));
for (Entry<Boolean, List<KeyValue>> entry : keyValueMap.entrySet()) {
ServiceMetadata service = serviceController.getService(entry.getKey());
- Map<String, List<Instance>> instanceMap = client.getAllInstances(service.getServiceName(), false).stream().collect(Collectors.groupingBy(NacosMetadataUtil::getKey));
+ Map<String, List<Instance>> instanceMap = client.getAllInstances(service.getServiceName(), false).stream().collect(Collectors.groupingBy(NacosMetaDataUtil::getKey));
keyValues.removeIf(keyValue -> {
Collection<Instance> instances = instanceMap.get(keyValue.getKey());
String value = keyValue.getValue();
- return CollectionUtils.isNotEmpty(instances) ? instances.stream().anyMatch(instance -> StringUtils.equals(NacosMetadataUtil.getValue(instance), value)) : Objects.isNull(value);
+ return CollectionUtils.isNotEmpty(instances) ? instances.stream().anyMatch(instance -> StringUtils.equals(NacosMetaDataUtil.getValue(instance), value)) : Objects.isNull(value);
});
}
return keyValues.isEmpty();
diff --git a/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/listener/NamingEventListener.java b/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/listener/NamingEventListener.java
index 8202d94761b..89a10ebd93e 100644
--- a/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/listener/NamingEventListener.java
+++ b/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/listener/NamingEventListener.java
@@ -24,7 +24,7 @@ import com.alibaba.nacos.api.naming.pojo.Instance;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEvent;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener;
-import org.apache.shardingsphere.mode.repository.cluster.nacos.utils.NacosMetadataUtil;
+import org.apache.shardingsphere.mode.repository.cluster.nacos.utils.NacosMetaDataUtil;
import java.util.Comparator;
import java.util.HashMap;
@@ -50,19 +50,19 @@ public final class NamingEventListener implements EventListener {
return;
}
NamingEvent namingEvent = (NamingEvent) event;
- List<Instance> instances = namingEvent.getInstances().stream().sorted(Comparator.comparing(NacosMetadataUtil::getKey)).collect(Collectors.toList());
+ List<Instance> instances = namingEvent.getInstances().stream().sorted(Comparator.comparing(NacosMetaDataUtil::getKey)).collect(Collectors.toList());
List<WatchData> watchDataList = new LinkedList<>();
synchronized (this) {
instances.forEach(instance -> prefixListenerMap.forEach((prefixPath, listener) -> {
- String key = NacosMetadataUtil.getKey(instance);
+ String key = NacosMetaDataUtil.getKey(instance);
if (key.startsWith(prefixPath)) {
Instance preInstance = preInstances.remove(key);
WatchData watchData = new WatchData(key, preInstance, instance, listener);
watchDataList.add(watchData);
}
}));
- preInstances.values().stream().sorted(Comparator.comparing(NacosMetadataUtil::getKey).reversed()).forEach(instance -> prefixListenerMap.forEach((prefixPath, listener) -> {
- String key = NacosMetadataUtil.getKey(instance);
+ preInstances.values().stream().sorted(Comparator.comparing(NacosMetaDataUtil::getKey).reversed()).forEach(instance -> prefixListenerMap.forEach((prefixPath, listener) -> {
+ String key = NacosMetaDataUtil.getKey(instance);
if (key.startsWith(prefixPath)) {
WatchData watchData = new WatchData(key, instance, null, listener);
watchDataList.add(watchData);
@@ -77,10 +77,10 @@ public final class NamingEventListener implements EventListener {
switch (changedType) {
case ADDED:
case UPDATED:
- listener.onChange(new DataChangedEvent(key, NacosMetadataUtil.getValue(instance), changedType));
+ listener.onChange(new DataChangedEvent(key, NacosMetaDataUtil.getValue(instance), changedType));
break;
case DELETED:
- listener.onChange(new DataChangedEvent(key, NacosMetadataUtil.getValue(preInstance), changedType));
+ listener.onChange(new DataChangedEvent(key, NacosMetaDataUtil.getValue(preInstance), changedType));
break;
default:
}
@@ -93,7 +93,7 @@ public final class NamingEventListener implements EventListener {
if (Objects.isNull(preInstance) && Objects.nonNull(instance)) {
return DataChangedEvent.Type.ADDED;
}
- if (Objects.nonNull(preInstance) && Objects.nonNull(instance) && NacosMetadataUtil.getTimestamp(preInstance) != NacosMetadataUtil.getTimestamp(instance)) {
+ if (Objects.nonNull(preInstance) && Objects.nonNull(instance) && NacosMetaDataUtil.getTimestamp(preInstance) != NacosMetaDataUtil.getTimestamp(instance)) {
return DataChangedEvent.Type.UPDATED;
}
if (Objects.nonNull(preInstance) && Objects.isNull(instance)) {
@@ -110,12 +110,12 @@ public final class NamingEventListener implements EventListener {
public void setPreInstances(final List<Instance> instances) {
preInstances = instances.stream().filter(instance -> {
for (String each : prefixListenerMap.keySet()) {
- if (NacosMetadataUtil.getKey(instance).startsWith(each)) {
+ if (NacosMetaDataUtil.getKey(instance).startsWith(each)) {
return true;
}
}
return false;
- }).collect(Collectors.toMap(NacosMetadataUtil::getKey, Function.identity(), (a, b) -> NacosMetadataUtil.getTimestamp(a) > NacosMetadataUtil.getTimestamp(b) ? a : b));
+ }).collect(Collectors.toMap(NacosMetaDataUtil::getKey, Function.identity(), (a, b) -> NacosMetaDataUtil.getTimestamp(a) > NacosMetaDataUtil.getTimestamp(b) ? a : b));
}
/**
diff --git a/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/utils/NacosMetadataUtil.java b/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/utils/NacosMetaDataUtil.java
similarity index 97%
rename from mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/utils/NacosMetadataUtil.java
rename to mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/utils/NacosMetaDataUtil.java
index 23487d9462b..bc74ca687ae 100644
--- a/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/utils/NacosMetadataUtil.java
+++ b/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/utils/NacosMetaDataUtil.java
@@ -28,10 +28,10 @@ import java.time.LocalDateTime;
import java.time.ZoneOffset;
/**
- * Nacos Metadata util.
+ * Nacos meta data util.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class NacosMetadataUtil {
+public final class NacosMetaDataUtil {
public static final ZoneOffset UTC_ZONE_OFFSET = ZoneOffset.of("+8");
diff --git a/mode/type/cluster/repository/provider/nacos/src/test/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepositoryTest.java b/mode/type/cluster/repository/provider/nacos/src/test/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepositoryTest.java
index b2f537559e6..1d493d30786 100644
--- a/mode/type/cluster/repository/provider/nacos/src/test/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepositoryTest.java
+++ b/mode/type/cluster/repository/provider/nacos/src/test/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepositoryTest.java
@@ -34,7 +34,7 @@ import org.apache.shardingsphere.mode.repository.cluster.nacos.entity.ServiceCon
import org.apache.shardingsphere.mode.repository.cluster.nacos.entity.ServiceMetadata;
import org.apache.shardingsphere.mode.repository.cluster.nacos.props.NacosProperties;
import org.apache.shardingsphere.mode.repository.cluster.nacos.props.NacosPropertyKey;
-import org.apache.shardingsphere.mode.repository.cluster.nacos.utils.NacosMetadataUtil;
+import org.apache.shardingsphere.mode.repository.cluster.nacos.utils.NacosMetaDataUtil;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -94,7 +94,7 @@ public final class NacosRepositoryTest {
Instance instance = new Instance();
Map<String, String> metadataMap = new HashMap<>(2, 1);
metadataMap.put(key, "value" + count);
- metadataMap.put(NacosMetadataUtil.UTC_ZONE_OFFSET.toString(), String.valueOf(count));
+ metadataMap.put(NacosMetaDataUtil.UTC_ZONE_OFFSET.toString(), String.valueOf(count));
instance.setMetadata(metadataMap);
instances.add(instance);
}
@@ -135,7 +135,7 @@ public final class NacosRepositoryTest {
ServiceMetadata persistentService = serviceController.getPersistentService();
assertThat(registerType, is(persistentService.getServiceName()));
assertThat(registerInstance.isEphemeral(), is(false));
- assertThat(NacosMetadataUtil.getValue(registerInstance), is("value4"));
+ assertThat(NacosMetaDataUtil.getValue(registerInstance), is("value4"));
}
@Test
@@ -163,7 +163,7 @@ public final class NacosRepositoryTest {
assertThat(registerType, is(persistentService.getServiceName()));
assertThat(registerInstance.getIp(), is(ip));
assertThat(registerInstance.isEphemeral(), is(false));
- assertThat(NacosMetadataUtil.getValue(registerInstance), is("value4"));
+ assertThat(NacosMetaDataUtil.getValue(registerInstance), is("value4"));
}
@Test
@@ -196,7 +196,7 @@ public final class NacosRepositoryTest {
String registerType = stringArgumentCaptor.getValue();
assertThat(registerType, is(ephemeralService.getServiceName()));
assertThat(registerInstance.isEphemeral(), is(true));
- assertThat(NacosMetadataUtil.getValue(registerInstance), is("value4"));
+ assertThat(NacosMetaDataUtil.getValue(registerInstance), is("value4"));
Map<String, String> metadata = registerInstance.getMetadata();
long timeToLiveSeconds = Long.parseLong(NacosPropertyKey.TIME_TO_LIVE_SECONDS.getDefaultValue());
assertThat(metadata.get(PreservedMetadataKeys.HEART_BEAT_INTERVAL), is(String.valueOf(timeToLiveSeconds * 1000 / 3)));
@@ -231,7 +231,7 @@ public final class NacosRepositoryTest {
ServiceMetadata ephemeralService = serviceController.getEphemeralService();
assertThat(registerType, is(ephemeralService.getServiceName()));
assertThat(registerInstance.isEphemeral(), is(true));
- assertThat(NacosMetadataUtil.getValue(registerInstance), is("value0"));
+ assertThat(NacosMetaDataUtil.getValue(registerInstance), is("value0"));
Map<String, String> metadata = registerInstance.getMetadata();
long timeToLiveSeconds = Long.parseLong(NacosPropertyKey.TIME_TO_LIVE_SECONDS.getDefaultValue());
assertThat(metadata.get(PreservedMetadataKeys.HEART_BEAT_INTERVAL), is(String.valueOf(timeToLiveSeconds * 1000 / 3)));
@@ -294,16 +294,16 @@ public final class NacosRepositoryTest {
ServiceMetadata persistentService = serviceController.getPersistentService();
persistentService.setListener(null);
String key = "key/key";
- long epochMilliseconds = NacosMetadataUtil.getTimestamp();
+ long epochMilliseconds = NacosMetaDataUtil.getTimestamp();
Instance preInstance = new Instance();
Map<String, String> metadataMap = new HashMap<>();
metadataMap.put(key, "value1");
- metadataMap.put(NacosMetadataUtil.UTC_ZONE_OFFSET.toString(), String.valueOf(epochMilliseconds));
+ metadataMap.put(NacosMetaDataUtil.UTC_ZONE_OFFSET.toString(), String.valueOf(epochMilliseconds));
preInstance.setMetadata(metadataMap);
final Instance instance = new Instance();
metadataMap = new HashMap<>();
metadataMap.put(key, "value2");
- metadataMap.put(NacosMetadataUtil.UTC_ZONE_OFFSET.toString(), String.valueOf(epochMilliseconds + 1));
+ metadataMap.put(NacosMetaDataUtil.UTC_ZONE_OFFSET.toString(), String.valueOf(epochMilliseconds + 1));
instance.setMetadata(metadataMap);
Event event = new NamingEvent(persistentService.getServiceName(), Collections.singletonList(instance));
doAnswer(AdditionalAnswers.answerVoid(getListenerAnswer(preInstance, event))).when(client).subscribe(anyString(), any(EventListener.class));
@@ -355,7 +355,7 @@ public final class NacosRepositoryTest {
MemberAccessor accessor = Plugins.getMemberAccessor();
if (Objects.nonNull(preInstance)) {
Map<String, Instance> preInstances = new HashMap<>();
- preInstances.put(NacosMetadataUtil.getKey(preInstance), preInstance);
+ preInstances.put(NacosMetaDataUtil.getKey(preInstance), preInstance);
accessor.set(listener.getClass().getDeclaredField("preInstances"), listener, preInstances);
}
listener.onEvent(event);
diff --git a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
index a097c18dd5d..7b705b9dbed 100644
--- a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
+++ b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
@@ -26,9 +26,9 @@ import org.apache.shardingsphere.mode.manager.ContextManagerBuilder;
import org.apache.shardingsphere.mode.manager.ContextManagerBuilderParameter;
import org.apache.shardingsphere.mode.manager.standalone.subscriber.ProcessStandaloneSubscriber;
import org.apache.shardingsphere.mode.manager.standalone.workerid.generator.StandaloneWorkerIdGenerator;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.MetadataContextsFactory;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContextsFactory;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.repository.standalone.StandalonePersistRepository;
import org.apache.shardingsphere.mode.repository.standalone.StandalonePersistRepositoryFactory;
@@ -42,15 +42,15 @@ public final class StandaloneContextManagerBuilder implements ContextManagerBuil
@Override
public ContextManager build(final ContextManagerBuilderParameter param) throws SQLException {
StandalonePersistRepository repository = StandalonePersistRepositoryFactory.getInstance(param.getModeConfiguration().getRepository());
- MetadataPersistService persistService = new MetadataPersistService(repository);
+ MetaDataPersistService persistService = new MetaDataPersistService(repository);
persistConfigurations(persistService, param);
InstanceContext instanceContext = buildInstanceContext(param);
new ProcessStandaloneSubscriber(instanceContext.getEventBusContext());
- MetadataContexts metadataContexts = MetadataContextsFactory.create(persistService, param, instanceContext);
- return new ContextManager(metadataContexts, instanceContext);
+ MetaDataContexts metaDataContexts = MetaDataContextsFactory.create(persistService, param, instanceContext);
+ return new ContextManager(metaDataContexts, instanceContext);
}
- private void persistConfigurations(final MetadataPersistService persistService, final ContextManagerBuilderParameter param) {
+ private void persistConfigurations(final MetaDataPersistService persistService, final ContextManagerBuilderParameter param) {
if (!param.isEmpty()) {
persistService.persistConfigurations(param.getDatabaseConfigs(), param.getGlobalRuleConfigs(), param.getProps());
}
diff --git a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTextTest.java b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTextTest.java
index 9dd339d92da..4504c865481 100644
--- a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTextTest.java
+++ b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTextTest.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import org.apache.shardingsphere.infra.instance.metadata.proxy.ProxyInstanceMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.manager.ContextManagerBuilderParameter;
-import org.apache.shardingsphere.mode.metadata.persist.node.DatabaseMetadataNode;
+import org.apache.shardingsphere.mode.metadata.persist.node.DatabaseMetaDataNode;
import org.apache.shardingsphere.mode.metadata.persist.node.GlobalNode;
import org.apache.shardingsphere.mode.persist.PersistRepository;
import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
@@ -46,11 +46,11 @@ public final class StandaloneContextManagerBuilderTextTest {
@Test
public void assertBuild() throws SQLException {
ContextManager actual = new StandaloneContextManagerBuilder().build(createContextManagerBuilderParameter());
- assertNotNull(actual.getMetadataContexts().getMetadata().getDatabase("foo_db"));
- PersistRepository repository = actual.getMetadataContexts().getPersistService().getRepository();
+ assertNotNull(actual.getMetaDataContexts().getMetaData().getDatabase("foo_db"));
+ PersistRepository repository = actual.getMetaDataContexts().getPersistService().getRepository();
assertNotNull(repository.getDirectly(GlobalNode.getGlobalRuleNode()));
- assertNotNull(repository.getDirectly(DatabaseMetadataNode.getMetadataDataSourcePath("foo_db", "0")));
- assertNotNull(repository.getDirectly(DatabaseMetadataNode.getRulePath("foo_db", "0")));
+ assertNotNull(repository.getDirectly(DatabaseMetaDataNode.getMetaDataDataSourcePath("foo_db", "0")));
+ assertNotNull(repository.getDirectly(DatabaseMetaDataNode.getRulePath("foo_db", "0")));
}
private ContextManagerBuilderParameter createContextManagerBuilderParameter() {
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java
index 1241b5d00d0..d99e1b97844 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java
@@ -89,7 +89,7 @@ public abstract class DatabaseCommunicationEngine implements DatabaseBackendHand
this.database = database;
this.queryContext = queryContext;
this.backendConnection = backendConnection;
- metadataRefreshEngine = new MetaDataRefreshEngine(database, ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps());
+ metadataRefreshEngine = new MetaDataRefreshEngine(database, ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps());
if (sqlStatementContext instanceof CursorAvailable) {
prepareCursorStatementContext((CursorAvailable) sqlStatementContext, backendConnection.getConnectionSession());
}
@@ -169,7 +169,7 @@ public abstract class DatabaseCommunicationEngine implements DatabaseBackendHand
}
protected MergedResult mergeQuery(final SQLStatementContext<?> sqlStatementContext, final List<QueryResult> queryResults) throws SQLException {
- MergeEngine mergeEngine = new MergeEngine(database, ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps(),
+ MergeEngine mergeEngine = new MergeEngine(database, ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps(),
getBackendConnection().getConnectionSession().getConnectionContext());
return mergeEngine.merge(queryResults, sqlStatementContext);
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutor.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutor.java
index ef0710aed9c..4992eb2170d 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutor.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutor.java
@@ -39,7 +39,7 @@ import org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc.Statemen
import org.apache.shardingsphere.infra.executor.sql.prepare.raw.RawExecutionPrepareEngine;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.rule.identifier.type.RawExecutionRule;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.JDBCDatabaseCommunicationEngine;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.JDBCBackendConnection;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.executor.ProxyJDBCExecutor;
@@ -86,10 +86,10 @@ public final class ProxySQLExecutor {
this.type = type;
this.backendConnection = backendConnection;
ExecutorEngine executorEngine = BackendExecutorContext.getInstance().getExecutorEngine();
- MetadataContexts metadataContexts = ProxyContext.getInstance().getContextManager().getMetadataContexts();
+ MetaDataContexts metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
ConnectionContext connectionContext = backendConnection.getConnectionSession().getConnectionContext();
jdbcExecutor = new ProxyJDBCExecutor(type, backendConnection.getConnectionSession(), databaseCommunicationEngine, new JDBCExecutor(executorEngine, connectionContext));
- rawExecutor = new RawExecutor(executorEngine, connectionContext, metadataContexts.getMetadata().getProps(), ProxyContext.getInstance().getContextManager().getInstanceContext()
+ rawExecutor = new RawExecutor(executorEngine, connectionContext, metaDataContexts.getMetaData().getProps(), ProxyContext.getInstance().getContextManager().getInstanceContext()
.getEventBusContext());
}
@@ -170,7 +170,7 @@ public final class ProxySQLExecutor {
// CHECKSTYLE:ON
transactionManager.rollback();
String databaseName = backendConnection.getConnectionSession().getDatabaseName();
- throw SQLExceptionTransformEngine.toSQLException(ex, ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata()
+ throw SQLExceptionTransformEngine.toSQLException(ex, ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData()
.getDatabase(databaseName).getProtocolType().getType());
}
return result;
@@ -178,9 +178,9 @@ public final class ProxySQLExecutor {
private List<ExecuteResult> doExecute(final ExecutionContext executionContext) throws SQLException {
String databaseName = backendConnection.getConnectionSession().getDatabaseName();
- Collection<ShardingSphereRule> rules = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase(databaseName).getRuleMetaData().getRules();
+ Collection<ShardingSphereRule> rules = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase(databaseName).getRuleMetaData().getRules();
int maxConnectionsSizePerQuery = ProxyContext.getInstance()
- .getContextManager().getMetadataContexts().getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY);
+ .getContextManager().getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY);
boolean isReturnGeneratedKeys = executionContext.getSqlStatementContext().getSqlStatement() instanceof MySQLInsertStatement;
return hasRawExecutionRule(rules) ? rawExecute(executionContext, rules, maxConnectionsSizePerQuery)
: useDriverToExecute(executionContext, rules, maxConnectionsSizePerQuery, isReturnGeneratedKeys, SQLExecutorExceptionHandler.isExceptionThrown());
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ReactiveProxySQLExecutor.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ReactiveProxySQLExecutor.java
index 688bccaca36..f5d2650f2ed 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ReactiveProxySQLExecutor.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ReactiveProxySQLExecutor.java
@@ -127,9 +127,9 @@ public final class ReactiveProxySQLExecutor {
*/
public Future<List<ExecuteResult>> execute(final ExecutionContext executionContext) throws SQLException {
String databaseName = backendConnection.getConnectionSession().getDatabaseName();
- Collection<ShardingSphereRule> rules = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase(databaseName).getRuleMetaData().getRules();
+ Collection<ShardingSphereRule> rules = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase(databaseName).getRuleMetaData().getRules();
int maxConnectionsSizePerQuery = ProxyContext.getInstance()
- .getContextManager().getMetadataContexts().getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY);
+ .getContextManager().getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY);
return useDriverToExecute(executionContext, rules, maxConnectionsSizePerQuery);
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngine.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngine.java
index 792214a7b52..ceb2ad2423e 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngine.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngine.java
@@ -34,7 +34,7 @@ import org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.dr
import org.apache.shardingsphere.infra.executor.sql.prepare.driver.DriverExecutionPrepareEngine;
import org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc.StatementOption;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.proxy.backend.communication.DatabaseCommunicationEngine;
import org.apache.shardingsphere.proxy.backend.communication.ProxySQLExecutor;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.JDBCBackendConnection;
@@ -114,16 +114,16 @@ public final class JDBCDatabaseCommunicationEngine extends DatabaseCommunication
@Override
public ResponseHeader execute() throws SQLException {
QueryContext queryContext = getQueryContext();
- MetadataContexts metadataContexts = ProxyContext.getInstance().getContextManager().getMetadataContexts();
- ShardingSphereDatabase database = metadataContexts.getMetadata().getDatabase(backendConnection.getConnectionSession().getDatabaseName());
- SQLFederationDeciderContext deciderContext = decide(queryContext, metadataContexts.getMetadata().getProps(), database);
+ MetaDataContexts metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
+ ShardingSphereDatabase database = metaDataContexts.getMetaData().getDatabase(backendConnection.getConnectionSession().getDatabaseName());
+ SQLFederationDeciderContext deciderContext = decide(queryContext, metaDataContexts.getMetaData().getProps(), database);
if (deciderContext.isUseSQLFederation()) {
prepareFederationExecutor();
- ResultSet resultSet = doExecuteFederation(queryContext, metadataContexts);
- return processExecuteFederation(resultSet, metadataContexts);
+ ResultSet resultSet = doExecuteFederation(queryContext, metaDataContexts);
+ return processExecuteFederation(resultSet, metaDataContexts);
}
- ExecutionContext executionContext = getKernelProcessor().generateExecutionContext(queryContext, getDatabase(), metadataContexts.getMetadata().getGlobalRuleMetaData(),
- metadataContexts.getMetadata().getProps(), backendConnection.getConnectionSession().getConnectionContext());
+ ExecutionContext executionContext = getKernelProcessor().generateExecutionContext(queryContext, getDatabase(), metaDataContexts.getMetaData().getGlobalRuleMetaData(),
+ metaDataContexts.getMetaData().getProps(), backendConnection.getConnectionSession().getConnectionContext());
if (executionContext.getExecutionUnits().isEmpty()) {
return new UpdateResponseHeader(executionContext.getSqlStatementContext().getSqlStatement());
}
@@ -142,40 +142,40 @@ public final class JDBCDatabaseCommunicationEngine extends DatabaseCommunication
}
private void prepareFederationExecutor() {
- MetadataContexts metadataContexts = ProxyContext.getInstance().getContextManager().getMetadataContexts();
+ MetaDataContexts metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
String databaseName = backendConnection.getConnectionSession().getDatabaseName();
DatabaseType databaseType = getQueryContext().getSqlStatementContext().getDatabaseType();
String schemaName = getQueryContext().getSqlStatementContext().getTablesContext().getSchemaName().orElseGet(() -> DatabaseTypeEngine.getDefaultSchemaName(databaseType, databaseName));
- SQLFederationRule sqlFederationRule = metadataContexts.getMetadata().getGlobalRuleMetaData().getSingleRule(SQLFederationRule.class);
- federationExecutor = sqlFederationRule.getSQLFederationExecutor(databaseName, schemaName, metadataContexts.getMetadata(), metadataContexts.getShardingSphereData(),
+ SQLFederationRule sqlFederationRule = metaDataContexts.getMetaData().getGlobalRuleMetaData().getSingleRule(SQLFederationRule.class);
+ federationExecutor = sqlFederationRule.getSQLFederationExecutor(databaseName, schemaName, metaDataContexts.getMetaData(), metaDataContexts.getShardingSphereData(),
new JDBCExecutor(BackendExecutorContext.getInstance().getExecutorEngine(), backendConnection.getConnectionSession().getConnectionContext()),
ProxyContext.getInstance().getContextManager().getInstanceContext().getEventBusContext());
}
- private ResultSet doExecuteFederation(final QueryContext queryContext, final MetadataContexts metadataContexts) throws SQLException {
+ private ResultSet doExecuteFederation(final QueryContext queryContext, final MetaDataContexts metaDataContexts) throws SQLException {
boolean isReturnGeneratedKeys = queryContext.getSqlStatementContext().getSqlStatement() instanceof MySQLInsertStatement;
- ShardingSphereDatabase database = metadataContexts.getMetadata().getDatabase(backendConnection.getConnectionSession().getDatabaseName());
+ ShardingSphereDatabase database = metaDataContexts.getMetaData().getDatabase(backendConnection.getConnectionSession().getDatabaseName());
DatabaseType protocolType = database.getProtocolType();
Map<String, DatabaseType> storageTypes = database.getResourceMetaData().getStorageTypes();
ProxyJDBCExecutorCallback callback = ProxyJDBCExecutorCallbackFactory.newInstance(getDriverType(), protocolType, storageTypes,
queryContext.getSqlStatementContext().getSqlStatement(), this, isReturnGeneratedKeys, SQLExecutorExceptionHandler.isExceptionThrown(), true);
- DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine = createDriverExecutionPrepareEngine(isReturnGeneratedKeys, metadataContexts);
- SQLFederationExecutorContext context = new SQLFederationExecutorContext(false, queryContext, metadataContexts.getMetadata());
+ DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine = createDriverExecutionPrepareEngine(isReturnGeneratedKeys, metaDataContexts);
+ SQLFederationExecutorContext context = new SQLFederationExecutorContext(false, queryContext, metaDataContexts.getMetaData());
return federationExecutor.executeQuery(prepareEngine, callback, context);
}
- private DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> createDriverExecutionPrepareEngine(final boolean isReturnGeneratedKeys, final MetadataContexts metaData) {
- int maxConnectionsSizePerQuery = metaData.getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY);
+ private DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> createDriverExecutionPrepareEngine(final boolean isReturnGeneratedKeys, final MetaDataContexts metaData) {
+ int maxConnectionsSizePerQuery = metaData.getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY);
JDBCBackendStatement statementManager = (JDBCBackendStatement) backendConnection.getConnectionSession().getStatementManager();
return new DriverExecutionPrepareEngine<>(getDriverType(), maxConnectionsSizePerQuery, backendConnection, statementManager,
- new StatementOption(isReturnGeneratedKeys), metaData.getMetadata().getDatabase(backendConnection.getConnectionSession().getDatabaseName()).getRuleMetaData().getRules(),
- metaData.getMetadata().getDatabase(backendConnection.getConnectionSession().getDatabaseName()).getResourceMetaData().getStorageTypes());
+ new StatementOption(isReturnGeneratedKeys), metaData.getMetaData().getDatabase(backendConnection.getConnectionSession().getDatabaseName()).getRuleMetaData().getRules(),
+ metaData.getMetaData().getDatabase(backendConnection.getConnectionSession().getDatabaseName()).getResourceMetaData().getStorageTypes());
}
- private ResponseHeader processExecuteFederation(final ResultSet resultSet, final MetadataContexts metadataContexts) throws SQLException {
+ private ResponseHeader processExecuteFederation(final ResultSet resultSet, final MetaDataContexts metaDataContexts) throws SQLException {
int columnCount = resultSet.getMetaData().getColumnCount();
setQueryHeaders(new ArrayList<>(columnCount));
- ShardingSphereDatabase database = metadataContexts.getMetadata().getDatabase(backendConnection.getConnectionSession().getDatabaseName());
+ ShardingSphereDatabase database = metaDataContexts.getMetaData().getDatabase(backendConnection.getConnectionSession().getDatabaseName());
QueryHeaderBuilderEngine queryHeaderBuilderEngine = new QueryHeaderBuilderEngine(null == database ? null : database.getProtocolType());
for (int columnIndex = 1; columnIndex <= columnCount; columnIndex++) {
getQueryHeaders().add(queryHeaderBuilderEngine.build(new JDBCQueryResultMetaData(resultSet.getMetaData()), database, columnIndex));
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSource.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSource.java
index 31f9076a01c..a48e1c8a83e 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSource.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSource.java
@@ -51,7 +51,7 @@ public final class JDBCBackendDataSource implements BackendDataSource {
*/
public List<Connection> getConnections(final String databaseName, final String dataSourceName, final int connectionSize, final ConnectionMode connectionMode) throws SQLException {
return getConnections(databaseName, dataSourceName, connectionSize, connectionMode,
- ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData().getSingleRule(TransactionRule.class).getDefaultType());
+ ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(TransactionRule.class).getDefaultType());
}
/**
@@ -68,7 +68,7 @@ public final class JDBCBackendDataSource implements BackendDataSource {
@SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter")
public List<Connection> getConnections(final String databaseName, final String dataSourceName,
final int connectionSize, final ConnectionMode connectionMode, final TransactionType transactionType) throws SQLException {
- DataSource dataSource = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase(databaseName).getResourceMetaData().getDataSources().get(dataSourceName);
+ DataSource dataSource = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase(databaseName).getResourceMetaData().getDataSources().get(dataSourceName);
if (dataSourceName.contains(".")) {
String dataSourceStr = dataSourceName.split("\\.")[0];
if (GlobalDataSourceRegistry.getInstance().getCachedDataSourceDataSources().containsKey(dataSourceStr)) {
@@ -104,7 +104,7 @@ public final class JDBCBackendDataSource implements BackendDataSource {
}
private Connection createConnection(final String databaseName, final String dataSourceName, final DataSource dataSource, final TransactionType transactionType) throws SQLException {
- TransactionRule transactionRule = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData().getSingleRule(TransactionRule.class);
+ TransactionRule transactionRule = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(TransactionRule.class);
ShardingSphereTransactionManager transactionManager = transactionRule.getResource().getTransactionManager(transactionType);
Connection result = isInTransaction(transactionManager) ? transactionManager.getConnection(databaseName, dataSourceName) : dataSource.getConnection();
if (dataSourceName.contains(".")) {
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/ProxyJDBCExecutor.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/ProxyJDBCExecutor.java
index 82a6af58aca..989ccd542c4 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/ProxyJDBCExecutor.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/ProxyJDBCExecutor.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.J
import org.apache.shardingsphere.infra.executor.sql.execute.result.ExecuteResult;
import org.apache.shardingsphere.infra.executor.sql.process.ExecuteProcessEngine;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.JDBCDatabaseCommunicationEngine;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.executor.callback.ProxyJDBCExecutorCallbackFactory;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
@@ -65,9 +65,9 @@ public final class ProxyJDBCExecutor {
public List<ExecuteResult> execute(final QueryContext queryContext, final ExecutionGroupContext<JDBCExecutionUnit> executionGroupContext,
final boolean isReturnGeneratedKeys, final boolean isExceptionThrown) throws SQLException {
try {
- MetadataContexts metadataContexts = ProxyContext.getInstance().getContextManager().getMetadataContexts();
+ MetaDataContexts metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
EventBusContext eventBusContext = ProxyContext.getInstance().getContextManager().getInstanceContext().getEventBusContext();
- ShardingSphereDatabase database = metadataContexts.getMetadata().getDatabase(connectionSession.getDatabaseName());
+ ShardingSphereDatabase database = metaDataContexts.getMetaData().getDatabase(connectionSession.getDatabaseName());
DatabaseType protocolType = database.getProtocolType();
Map<String, DatabaseType> storageTypes = database.getResourceMetaData().getStorageTypes();
ExecuteProcessEngine.initializeExecution(queryContext, executionGroupContext, eventBusContext);
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/callback/ProxyJDBCExecutorCallback.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/callback/ProxyJDBCExecutorCallback.java
index 2e1ee54bdf6..1a34ae79c2b 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/callback/ProxyJDBCExecutorCallback.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/callback/ProxyJDBCExecutorCallback.java
@@ -112,15 +112,15 @@ public abstract class ProxyJDBCExecutorCallback extends JDBCExecutorCallback<Exe
if (configuredDatabaseType.isPresent()) {
return configuredDatabaseType.get();
}
- if (ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabases().isEmpty()) {
+ if (ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases().isEmpty()) {
return DatabaseTypeEngine.getTrunkDatabaseType("MySQL");
}
- return ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabases().values().iterator().next().getProtocolType();
+ return ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases().values().iterator().next().getProtocolType();
}
private static Optional<DatabaseType> findConfiguredDatabaseType() {
String configuredDatabaseType = ProxyContext.getInstance()
- .getContextManager().getMetadataContexts().getMetadata().getProps().getValue(ConfigurationPropertyKey.PROXY_FRONTEND_DATABASE_PROTOCOL_TYPE);
+ .getContextManager().getMetaDataContexts().getMetaData().getProps().getValue(ConfigurationPropertyKey.PROXY_FRONTEND_DATABASE_PROTOCOL_TYPE);
return configuredDatabaseType.isEmpty() ? Optional.empty() : Optional.of(DatabaseTypeEngine.getTrunkDatabaseType(configuredDatabaseType));
}
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/impl/MySQLStatementMemoryStrictlyFetchSizeSetter.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/impl/MySQLStatementMemoryStrictlyFetchSizeSetter.java
index 89647a1363d..dc116c2b7b5 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/impl/MySQLStatementMemoryStrictlyFetchSizeSetter.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/impl/MySQLStatementMemoryStrictlyFetchSizeSetter.java
@@ -32,7 +32,7 @@ public final class MySQLStatementMemoryStrictlyFetchSizeSetter implements Statem
@Override
public void setFetchSize(final Statement statement) throws SQLException {
int configuredFetchSize = ProxyContext.getInstance()
- .getContextManager().getMetadataContexts().getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_BACKEND_QUERY_FETCH_SIZE);
+ .getContextManager().getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_BACKEND_QUERY_FETCH_SIZE);
statement.setFetchSize(ConfigurationPropertyKey.PROXY_BACKEND_QUERY_FETCH_SIZE.getDefaultValue().equals(String.valueOf(configuredFetchSize)) ? Integer.MIN_VALUE : configuredFetchSize);
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/impl/PostgreSQLStatementMemoryStrictlyFetchSizeSetter.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/impl/PostgreSQLStatementMemoryStrictlyFetchSizeSetter.java
index 1818451b6a9..c6f0655cf37 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/impl/PostgreSQLStatementMemoryStrictlyFetchSizeSetter.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/impl/PostgreSQLStatementMemoryStrictlyFetchSizeSetter.java
@@ -32,7 +32,7 @@ public final class PostgreSQLStatementMemoryStrictlyFetchSizeSetter implements S
@Override
public void setFetchSize(final Statement statement) throws SQLException {
int configuredFetchSize = ProxyContext.getInstance()
- .getContextManager().getMetadataContexts().getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_BACKEND_QUERY_FETCH_SIZE);
+ .getContextManager().getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_BACKEND_QUERY_FETCH_SIZE);
statement.setFetchSize(ConfigurationPropertyKey.PROXY_BACKEND_QUERY_FETCH_SIZE.getDefaultValue().equals(String.valueOf(configuredFetchSize)) ? 1 : configuredFetchSize);
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/JDBCBackendTransactionManager.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/JDBCBackendTransactionManager.java
index e2e387336ab..0173ec12529 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/JDBCBackendTransactionManager.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/JDBCBackendTransactionManager.java
@@ -48,7 +48,7 @@ public final class JDBCBackendTransactionManager implements TransactionManager<V
connection = backendConnection;
transactionType = connection.getConnectionSession().getTransactionStatus().getTransactionType();
localTransactionManager = new LocalTransactionManager(backendConnection);
- TransactionRule transactionRule = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData().getSingleRule(TransactionRule.class);
+ TransactionRule transactionRule = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(TransactionRule.class);
ShardingSphereTransactionManagerEngine engine = transactionRule.getResource();
shardingSphereTransactionManager = null == engine ? null : engine.getTransactionManager(transactionType);
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/vertx/VertxBackendDataSource.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/vertx/VertxBackendDataSource.java
index d1b7ed85b94..03404c62c66 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/vertx/VertxBackendDataSource.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/vertx/VertxBackendDataSource.java
@@ -128,7 +128,7 @@ public final class VertxBackendDataSource implements BackendDataSource {
}
private Pool createPoolFromSchemaDataSource(final String databaseName, final String dataSourceName) {
- DataSource dataSource = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase(databaseName).getResourceMetaData().getDataSources().get(dataSourceName);
+ DataSource dataSource = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase(databaseName).getResourceMetaData().getDataSources().get(dataSourceName);
Preconditions.checkNotNull(dataSource, "Can not get connection from datasource %s.", dataSourceName);
HikariDataSource value = (HikariDataSource) dataSource;
URI uri = URI.create(value.getJdbcUrl().replace("jdbc:", ""));
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/vertx/VertxDatabaseCommunicationEngine.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/vertx/VertxDatabaseCommunicationEngine.java
index 909fb0d86cb..f6b67ea7fe5 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/vertx/VertxDatabaseCommunicationEngine.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/vertx/VertxDatabaseCommunicationEngine.java
@@ -58,7 +58,7 @@ public final class VertxDatabaseCommunicationEngine extends DatabaseCommunicatio
@Override
public Future<ResponseHeader> executeFuture() {
try {
- ShardingSphereMetaData metaData = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata();
+ ShardingSphereMetaData metaData = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData();
SQLFederationDeciderContext deciderContext = decide(getQueryContext(), metaData.getProps(), getDatabase());
if (deciderContext.isUseSQLFederation()) {
return Future.failedFuture(new UnsupportedOperationException("Executing federated query by Vert.x is not supported yet."));
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/context/BackendExecutorContext.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/context/BackendExecutorContext.java
index db63d354c54..6306578602b 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/context/BackendExecutorContext.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/context/BackendExecutorContext.java
@@ -33,7 +33,7 @@ public final class BackendExecutorContext {
private static final BackendExecutorContext INSTANCE = new BackendExecutorContext();
private final ExecutorEngine executorEngine = ExecutorEngine.createExecutorEngineWithSize(
- ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE));
+ ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE));
/**
* Get executor context instance.
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/context/ProxyContext.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/context/ProxyContext.java
index 444e1224fd5..4bd49c9a43c 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/context/ProxyContext.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/context/ProxyContext.java
@@ -71,7 +71,7 @@ public final class ProxyContext {
* @return database exists or not
*/
public boolean databaseExists(final String name) {
- return contextManager.getMetadataContexts().getMetadata().containsDatabase(name);
+ return contextManager.getMetaDataContexts().getMetaData().containsDatabase(name);
}
/**
@@ -81,10 +81,10 @@ public final class ProxyContext {
* @return got database
*/
public ShardingSphereDatabase getDatabase(final String name) {
- if (Strings.isNullOrEmpty(name) || !contextManager.getMetadataContexts().getMetadata().containsDatabase(name)) {
+ if (Strings.isNullOrEmpty(name) || !contextManager.getMetaDataContexts().getMetaData().containsDatabase(name)) {
throw new NoDatabaseSelectedException();
}
- return contextManager.getMetadataContexts().getMetadata().getDatabase(name);
+ return contextManager.getMetaDataContexts().getMetaData().getDatabase(name);
}
/**
@@ -93,7 +93,7 @@ public final class ProxyContext {
* @return all database names
*/
public Collection<String> getAllDatabaseNames() {
- return contextManager.getMetadataContexts().getMetadata().getDatabases().values().stream().map(ShardingSphereDatabase::getName).collect(Collectors.toList());
+ return contextManager.getMetaDataContexts().getMetaData().getDatabases().values().stream().map(ShardingSphereDatabase::getName).collect(Collectors.toList());
}
/**
@@ -115,9 +115,9 @@ public final class ProxyContext {
public Collection<ShardingSphereRule> getRules(final String databaseName) {
Collection<ShardingSphereRule> result = new LinkedList<>();
if (!Strings.isNullOrEmpty(databaseName) && databaseExists(databaseName)) {
- result.addAll(contextManager.getMetadataContexts().getMetadata().getDatabase(databaseName).getRuleMetaData().getRules());
+ result.addAll(contextManager.getMetaDataContexts().getMetaData().getDatabase(databaseName).getRuleMetaData().getRules());
}
- result.addAll(contextManager.getMetadataContexts().getMetadata().getGlobalRuleMetaData().getRules());
+ result.addAll(contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules());
return result;
}
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java
index 6358c69ff46..04e126b8f58 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java
@@ -34,7 +34,7 @@ import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.util.exception.external.sql.type.generic.UnsupportedSQLOperationException;
import org.apache.shardingsphere.infra.util.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.handler.admin.DatabaseAdminBackendHandlerFactory;
@@ -100,7 +100,7 @@ public final class ProxyBackendHandlerFactory {
if (Strings.isNullOrEmpty(SQLUtil.trimComment(sql))) {
return new SkipBackendHandler(new EmptyStatement());
}
- SQLParserRule sqlParserRule = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
+ SQLParserRule sqlParserRule = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
SQLStatement sqlStatement = sqlParserRule.getSQLParserEngine(getProtocolType(databaseType, connectionSession).getType()).parse(sql, false);
return newInstance(databaseType, sql, sqlStatement, connectionSession, hintValueContext);
}
@@ -140,7 +140,7 @@ public final class ProxyBackendHandlerFactory {
checkUnsupportedDistSQLStatementInTransaction(sqlStatement, connectionSession);
return DistSQLBackendHandlerFactory.newInstance((DistSQLStatement) sqlStatement, connectionSession);
}
- SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata(),
+ SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData(),
sqlStatement, connectionSession.getDefaultDatabaseName());
QueryContext queryContext = new QueryContext(sqlStatementContext, sql, Collections.emptyList(), hintValueContext);
connectionSession.setQueryContext(queryContext);
@@ -192,7 +192,7 @@ public final class ProxyBackendHandlerFactory {
? sqlStatementContext.getTablesContext().getDatabaseName().get()
: connectionSession.getDatabaseName();
SQLCheckEngine.check(sqlStatementContext, queryContext.getParameters(),
- getRules(databaseName), databaseName, ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabases(), connectionSession.getGrantee());
+ getRules(databaseName), databaseName, ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases(), connectionSession.getGrantee());
backendHandler = DatabaseAdminBackendHandlerFactory.newInstance(databaseType, sqlStatementContext, connectionSession);
return backendHandler.orElseGet(() -> DatabaseBackendHandlerFactory.newInstance(queryContext, connectionSession, preferPreparedStatement));
}
@@ -210,7 +210,7 @@ public final class ProxyBackendHandlerFactory {
String databaseName = connectionSession.getDatabaseName();
return Strings.isNullOrEmpty(databaseName) || !ProxyContext.getInstance().databaseExists(databaseName)
? defaultDatabaseType
- : ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase(databaseName).getProtocolType();
+ : ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase(databaseName).getProtocolType();
}
private static void handleAutoCommit(final SQLStatement sqlStatement, final ConnectionSession connectionSession) {
@@ -236,13 +236,13 @@ public final class ProxyBackendHandlerFactory {
}
private static Collection<ShardingSphereRule> getRules(final String databaseName) {
- MetadataContexts contexts = ProxyContext.getInstance().getContextManager().getMetadataContexts();
+ MetaDataContexts contexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
if (Strings.isNullOrEmpty(databaseName) || !ProxyContext.getInstance().databaseExists(databaseName)) {
- return contexts.getMetadata().getGlobalRuleMetaData().getRules();
+ return contexts.getMetaData().getGlobalRuleMetaData().getRules();
}
Collection<ShardingSphereRule> result;
- result = new LinkedList<>(contexts.getMetadata().getDatabase(databaseName).getRuleMetaData().getRules());
- result.addAll(contexts.getMetadata().getGlobalRuleMetaData().getRules());
+ result = new LinkedList<>(contexts.getMetaData().getDatabase(databaseName).getRuleMetaData().getRules());
+ result.addAll(contexts.getMetaData().getGlobalRuleMetaData().getRules());
return result;
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/AbstractDatabaseMetadataExecutor.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/AbstractDatabaseMetadataExecutor.java
index 9155dcd88b3..61b8dd53df8 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/AbstractDatabaseMetadataExecutor.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/AbstractDatabaseMetadataExecutor.java
@@ -169,8 +169,8 @@ public abstract class AbstractDatabaseMetadataExecutor implements DatabaseAdminQ
private static Collection<ShardingSphereRule> getRules(final String databaseName) {
Collection<ShardingSphereRule> result;
- result = new LinkedList<>(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase(databaseName).getRuleMetaData().getRules());
- result.addAll(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData().getRules());
+ result = new LinkedList<>(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase(databaseName).getRuleMetaData().getRules());
+ result.addAll(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules());
return result;
}
@@ -207,7 +207,7 @@ public abstract class AbstractDatabaseMetadataExecutor implements DatabaseAdminQ
*/
@Override
protected void getSourceData(final String databaseName, final FunctionWithException<ResultSet, SQLException> callback) throws SQLException {
- ShardingSphereResourceMetaData resourceMetaData = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase(databaseName).getResourceMetaData();
+ ShardingSphereResourceMetaData resourceMetaData = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase(databaseName).getResourceMetaData();
Optional<Entry<String, DataSource>> dataSourceEntry = resourceMetaData.getDataSources().entrySet().stream().findFirst();
log.info("Actual SQL: {} ::: {}", dataSourceEntry.orElseThrow(() -> new StorageUnitNotExistedException(databaseName)).getKey(), sql);
try (
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLAdminExecutorCreator.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLAdminExecutorCreator.java
index 6d6527dcb24..51f6cbc54a9 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLAdminExecutorCreator.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLAdminExecutorCreator.java
@@ -170,7 +170,7 @@ public final class MySQLAdminExecutorCreator implements DatabaseAdminExecutorCre
if (hasNoResource()) {
return Optional.of(new NoResourceShowExecutor(sqlStatement));
}
- String driverType = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().getValue(ConfigurationPropertyKey.PROXY_BACKEND_DRIVER_TYPE);
+ String driverType = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().getValue(ConfigurationPropertyKey.PROXY_BACKEND_DRIVER_TYPE);
return isNotUseSchema && !"ExperimentalVertx".equals(driverType) ? Optional.of(new UnicastResourceShowExecutor(sqlStatement, sql)) : Optional.empty();
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLSetVariableAdminExecutor.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLSetVariableAdminExecutor.java
index 666adb6833f..04925a2253a 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLSetVariableAdminExecutor.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLSetVariableAdminExecutor.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.binder.QueryContext;
import org.apache.shardingsphere.infra.binder.SQLStatementContextFactory;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeFactory;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import org.apache.shardingsphere.proxy.backend.communication.DatabaseCommunicationEngineFactory;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
@@ -78,10 +78,10 @@ public final class MySQLSetVariableAdminExecutor implements DatabaseAdminExecuto
return;
}
String sql = "SET " + concatenatedGlobalVariables;
- MetadataContexts metadataContexts = ProxyContext.getInstance().getContextManager().getMetadataContexts();
- SQLParserRule sqlParserRule = metadataContexts.getMetadata().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
+ MetaDataContexts metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
+ SQLParserRule sqlParserRule = metaDataContexts.getMetaData().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
SQLStatement sqlStatement = sqlParserRule.getSQLParserEngine(DatabaseTypeFactory.getInstance("MySQL").getType()).parse(sql, false);
- SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata(),
+ SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData(),
sqlStatement, connectionSession.getDefaultDatabaseName());
DatabaseBackendHandler databaseBackendHandler = DatabaseCommunicationEngineFactory.getInstance()
.newDatabaseCommunicationEngine(new QueryContext(sqlStatementContext, sql, Collections.emptyList()), connectionSession.getBackendConnection(), false);
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowCurrentUserExecutor.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowCurrentUserExecutor.java
index 70af727d153..10c80cdba60 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowCurrentUserExecutor.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowCurrentUserExecutor.java
@@ -51,7 +51,7 @@ public final class ShowCurrentUserExecutor implements DatabaseAdminQueryExecutor
@Override
public void execute(final ConnectionSession connectionSession) {
- Collection<ShardingSphereRule> rules = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData().getRules();
+ Collection<ShardingSphereRule> rules = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules();
Optional<Grantee> grantee = rules.stream().filter(each -> each instanceof AuthorityRule)
.map(each -> ((AuthorityRule) each).findUser(connectionSession.getGrantee())).filter(Optional::isPresent)
.map(Optional::get).map(ShardingSphereUser::getGrantee).findFirst();
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowDatabasesExecutor.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowDatabasesExecutor.java
index 4af426ec31a..f47397db155 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowDatabasesExecutor.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowDatabasesExecutor.java
@@ -71,8 +71,8 @@ public final class ShowDatabasesExecutor implements DatabaseAdminQueryExecutor {
private Collection<ShardingSphereRule> getRules(final String databaseName) {
Collection<ShardingSphereRule> result;
- result = new LinkedList<>(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase(databaseName).getRuleMetaData().getRules());
- result.addAll(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData().getRules());
+ result = new LinkedList<>(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase(databaseName).getRuleMetaData().getRules());
+ result.addAll(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules());
return result;
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/UnicastResourceShowExecutor.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/UnicastResourceShowExecutor.java
index 8fb22587aa5..9d73e5ed214 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/UnicastResourceShowExecutor.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/UnicastResourceShowExecutor.java
@@ -78,7 +78,7 @@ public final class UnicastResourceShowExecutor implements DatabaseAdminQueryExec
ShardingSpherePreconditions.checkState(ProxyContext.getInstance().getDatabase(databaseName).containsDataSource(), () -> new StorageUnitNotExistedException(databaseName));
try {
connectionSession.setCurrentDatabase(databaseName);
- SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata(),
+ SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData(),
sqlStatement, connectionSession.getDefaultDatabaseName());
databaseCommunicationEngine = databaseCommunicationEngineFactory.newDatabaseCommunicationEngine(new QueryContext(sqlStatementContext, sql, Collections.emptyList()),
connectionSession.getBackendConnection(), false);
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/UseDatabaseExecutor.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/UseDatabaseExecutor.java
index 734f080fb40..3bcc5ca5798 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/UseDatabaseExecutor.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/UseDatabaseExecutor.java
@@ -52,8 +52,8 @@ public final class UseDatabaseExecutor implements DatabaseAdminExecutor {
private Collection<ShardingSphereRule> getRules(final String databaseName) {
Collection<ShardingSphereRule> result = new LinkedList<>();
Optional.ofNullable(ProxyContext.getInstance()
- .getContextManager().getMetadataContexts().getMetadata().getDatabase(databaseName)).ifPresent(optional -> result.addAll(optional.getRuleMetaData().getRules()));
- result.addAll(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData().getRules());
+ .getContextManager().getMetaDataContexts().getMetaData().getDatabase(databaseName)).ifPresent(optional -> result.addAll(optional.getRuleMetaData().getRules()));
+ result.addAll(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules());
return result;
}
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/information/SelectInformationSchemataExecutor.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/information/SelectInformationSchemataExecutor.java
index 949e7478e30..72d7c096f93 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/information/SelectInformationSchemataExecutor.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/information/SelectInformationSchemataExecutor.java
@@ -94,7 +94,7 @@ public final class SelectInformationSchemataExecutor extends DefaultDatabaseMeta
@Override
protected void rowPostProcessing(final String databaseName, final Map<String, Object> rowMap, final Map<String, String> aliasMap) {
- ShardingSphereResourceMetaData resourceMetaData = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase(databaseName).getResourceMetaData();
+ ShardingSphereResourceMetaData resourceMetaData = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase(databaseName).getResourceMetaData();
Set<String> catalogs = resourceMetaData.getDataSources().keySet().stream().map(each -> resourceMetaData.getDataSourceMetaData(each).getCatalog()).collect(Collectors.toSet());
schemaNameAlias = aliasMap.getOrDefault(SCHEMA_NAME, "");
String rowValue = rowMap.getOrDefault(schemaNameAlias, "").toString();
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectDatabaseExecutor.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectDatabaseExecutor.java
index 4c5f317c2b0..0480eb72233 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectDatabaseExecutor.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectDatabaseExecutor.java
@@ -87,7 +87,7 @@ public final class SelectDatabaseExecutor extends DefaultDatabaseMetadataExecuto
@Override
protected void rowPostProcessing(final String databaseName, final Map<String, Object> rowMap, final Map<String, String> aliasMap) {
buildColumnNames(aliasMap);
- ShardingSphereResourceMetaData resourceMetaData = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase(databaseName).getResourceMetaData();
+ ShardingSphereResourceMetaData resourceMetaData = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase(databaseName).getResourceMetaData();
Set<String> catalogs = resourceMetaData.getDataSources().keySet().stream().map(each -> resourceMetaData.getDataSourceMetaData(each).getCatalog()).collect(Collectors.toSet());
databaseNameAlias = aliasMap.getOrDefault(DATABASE_NAME, aliasMap.getOrDefault(DATNAME, aliasMap.getOrDefault(NAME, "")));
String rowValue = rowMap.getOrDefault(databaseNameAlias, "").toString();
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/data/impl/UnicastDatabaseBackendHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/data/impl/UnicastDatabaseBackendHandler.java
index fe358c56036..a20583b79e1 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/data/impl/UnicastDatabaseBackendHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/data/impl/UnicastDatabaseBackendHandler.java
@@ -84,7 +84,7 @@ public final class UnicastDatabaseBackendHandler implements DatabaseBackendHandl
if (databaseNames.isEmpty()) {
throw new NoDatabaseSelectedException();
}
- AuthorityRule authorityRule = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData().getSingleRule(AuthorityRule.class);
+ AuthorityRule authorityRule = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(AuthorityRule.class);
Optional<ShardingSpherePrivileges> privileges = authorityRule.findPrivileges(connectionSession.getGrantee());
Stream<String> databaseStream = databaseNames.stream().filter(each -> ProxyContext.getInstance().getDatabase(each).containsDataSource());
Optional<String> result = privileges.map(optional -> databaseStream.filter(optional::hasPrivileges).findFirst()).orElseGet(databaseStream::findFirst);
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseBackendHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseBackendHandler.java
index 856f7b34a12..1566d13c8d9 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseBackendHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseBackendHandler.java
@@ -71,11 +71,11 @@ public final class DropDatabaseBackendHandler implements ProxyBackendHandler {
private Collection<ShardingSphereRule> getRules(final String databaseName) {
Collection<ShardingSphereRule> result = new LinkedList<>();
- ShardingSphereDatabase database = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase(databaseName);
+ ShardingSphereDatabase database = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase(databaseName);
if (null != database && null != database.getRuleMetaData()) {
result.addAll(database.getRuleMetaData().getRules());
}
- result.addAll(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData().getRules());
+ result.addAll(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules());
return result;
}
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableGlobalRuleRALBackendHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableGlobalRuleRALBackendHandler.java
index f6742bfabf8..614e311c989 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableGlobalRuleRALBackendHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableGlobalRuleRALBackendHandler.java
@@ -48,7 +48,7 @@ public final class QueryableGlobalRuleRALBackendHandler implements ProxyBackendH
@Override
public ResponseHeader execute() {
- resultSet.init(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData(), sqlStatement);
+ resultSet.init(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData(), sqlStatement);
List<QueryHeader> queryHeaders = new ArrayList<>();
for (String each : resultSet.getColumnNames()) {
queryHeaders.add(new QueryHeader("", "", each, each, Types.CHAR, "CHAR", 255, 0, false, false, false, false));
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableGlobalRuleRALBackendHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableGlobalRuleRALBackendHandler.java
index 5a1965980d1..34ed8b39984 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableGlobalRuleRALBackendHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableGlobalRuleRALBackendHandler.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral;
import org.apache.shardingsphere.distsql.parser.statement.ral.RALStatement;
import org.apache.shardingsphere.infra.distsql.update.GlobalRuleRALUpdater;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.handler.ProxyBackendHandler;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
@@ -41,13 +41,13 @@ public final class UpdatableGlobalRuleRALBackendHandler implements ProxyBackendH
@Override
public ResponseHeader execute() {
- updater.executeUpdate(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata(), sqlStatement);
+ updater.executeUpdate(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData(), sqlStatement);
persistNewRuleConfigurations();
return new UpdateResponseHeader(sqlStatement);
}
private void persistNewRuleConfigurations() {
- MetadataContexts metadataContexts = ProxyContext.getInstance().getContextManager().getMetadataContexts();
- metadataContexts.getPersistService().getGlobalRuleService().persist(metadataContexts.getMetadata().getGlobalRuleMetaData().getConfigurations());
+ MetaDataContexts metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
+ metaDataContexts.getPersistService().getGlobalRuleService().persist(metaDataContexts.getMetaData().getGlobalRuleMetaData().getConfigurations());
}
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/hint/HintRALBackendHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/hint/HintRALBackendHandler.java
index 9d3dda1ad5e..dced2911706 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/hint/HintRALBackendHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/hint/HintRALBackendHandler.java
@@ -47,7 +47,7 @@ public final class HintRALBackendHandler extends RALBackendHandler {
@Override
public ResponseHeader execute() {
ShardingSpherePreconditions.checkState(
- ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().<Boolean>getValue(ConfigurationPropertyKey.PROXY_HINT_ENABLED),
+ ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().<Boolean>getValue(ConfigurationPropertyKey.PROXY_HINT_ENABLED),
() -> new UnsupportedSQLOperationException(String.format("%s should be true, please check your config", ConfigurationPropertyKey.PROXY_HINT_ENABLED.getKey())));
hintRALStatementExecutor = HintRALStatementExecutorFactory.newInstance(sqlStatement, connectionSession);
return hintRALStatementExecutor.execute();
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableHandler.java
index e9a4455dbfb..e9a5f79c197 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableHandler.java
@@ -62,7 +62,7 @@ public final class ShowDistVariableHandler extends QueryableRALBackendHandler<Sh
}
private String getConfigurationValue(final ContextManager contextManager, final String key) {
- return contextManager.getMetadataContexts().getMetadata().getProps().getValue(ConfigurationPropertyKey.valueOf(key)).toString();
+ return contextManager.getMetaDataContexts().getMetaData().getProps().getValue(ConfigurationPropertyKey.valueOf(key)).toString();
}
private String getSpecialValue(final String key) {
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariablesHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariablesHandler.java
index b9733cfba24..5ca09605f0d 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariablesHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariablesHandler.java
@@ -47,7 +47,7 @@ public final class ShowDistVariablesHandler extends QueryableRALBackendHandler<S
@Override
protected Collection<LocalDataQueryResultRow> getRows(final ContextManager contextManager) {
- ConfigurationProperties props = contextManager.getMetadataContexts().getMetadata().getProps();
+ ConfigurationProperties props = contextManager.getMetaDataContexts().getMetaData().getProps();
Collection<LocalDataQueryResultRow> result = ConfigurationPropertyKey.getKeyNames().stream()
.map(each -> new LocalDataQueryResultRow(each.toLowerCase(), props.getValue(ConfigurationPropertyKey.valueOf(each)).toString())).collect(Collectors.toList());
result.add(new LocalDataQueryResultRow(
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowStatusFromReadwriteSplittingRulesHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowStatusFromReadwriteSplittingRulesHandler.java
index 8ac30c75de4..5519f6f27c9 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowStatusFromReadwriteSplittingRulesHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowStatusFromReadwriteSplittingRulesHandler.java
@@ -29,8 +29,8 @@ import org.apache.shardingsphere.infra.rule.identifier.type.exportable.Exportabl
import org.apache.shardingsphere.infra.rule.identifier.type.exportable.RuleExportEngine;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.storage.service.StorageNodeStatusService;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.metadata.storage.StorageNodeDataSource;
import org.apache.shardingsphere.mode.metadata.storage.StorageNodeStatus;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
@@ -68,10 +68,10 @@ public final class ShowStatusFromReadwriteSplittingRulesHandler extends Queryabl
@Override
protected Collection<LocalDataQueryResultRow> getRows(final ContextManager contextManager) {
String databaseName = getDatabaseName();
- MetadataContexts metadataContexts = contextManager.getMetadataContexts();
- ShardingSphereDatabase database = metadataContexts.getMetadata().getDatabase(databaseName);
+ MetaDataContexts metaDataContexts = contextManager.getMetaDataContexts();
+ ShardingSphereDatabase database = metaDataContexts.getMetaData().getDatabase(databaseName);
Collection<String> allReadResources = getAllReadResources(database, getSqlStatement().getGroupName());
- Map<String, StorageNodeDataSource> persistentReadResources = getPersistentReadResources(databaseName, metadataContexts.getPersistService());
+ Map<String, StorageNodeDataSource> persistentReadResources = getPersistentReadResources(databaseName, metaDataContexts.getPersistService());
return buildRows(allReadResources, persistentReadResources);
}
@@ -100,7 +100,7 @@ public final class ShowStatusFromReadwriteSplittingRulesHandler extends Queryabl
.map(this::deconstructString).flatMap(Collection::stream).collect(Collectors.toCollection(LinkedHashSet::new));
}
- private Map<String, StorageNodeDataSource> getPersistentReadResources(final String databaseName, final MetadataPersistService persistService) {
+ private Map<String, StorageNodeDataSource> getPersistentReadResources(final String databaseName, final MetaDataPersistService persistService) {
if (null == persistService || null == persistService.getRepository() || !(persistService.getRepository() instanceof ClusterPersistRepository)) {
return Collections.emptyMap();
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterReadwriteSplittingStorageUnitStatusStatementHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterReadwriteSplittingStorageUnitStatusStatementHandler.java
index 4d2d7a75057..287da441e15 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterReadwriteSplittingStorageUnitStatusStatementHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterReadwriteSplittingStorageUnitStatusStatementHandler.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.infra.util.exception.ShardingSpherePrecondition
import org.apache.shardingsphere.infra.util.exception.external.sql.type.generic.UnsupportedSQLOperationException;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.storage.service.StorageNodeStatusService;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.metadata.storage.StorageNodeDataSource;
import org.apache.shardingsphere.mode.metadata.storage.StorageNodeRole;
import org.apache.shardingsphere.mode.metadata.storage.StorageNodeStatus;
@@ -84,7 +84,7 @@ public final class AlterReadwriteSplittingStorageUnitStatusStatementHandler exte
}
private void checkReadwriteSplittingRule(final ContextManager contextManager, final String databaseName) {
- Optional<ReadwriteSplittingRule> rule = contextManager.getMetadataContexts().getMetadata().getDatabase(databaseName).getRuleMetaData().findSingleRule(ReadwriteSplittingRule.class);
+ Optional<ReadwriteSplittingRule> rule = contextManager.getMetaDataContexts().getMetaData().getDatabase(databaseName).getRuleMetaData().findSingleRule(ReadwriteSplittingRule.class);
ShardingSpherePreconditions.checkState(rule.isPresent(), () -> new UnsupportedSQLOperationException("The current database has no read_write splitting rules"));
}
@@ -122,7 +122,7 @@ public final class AlterReadwriteSplittingStorageUnitStatusStatementHandler exte
}
private Map<String, String> getDisabledResources(final ContextManager contextManager, final String databaseName) {
- MetadataPersistService persistService = contextManager.getMetadataContexts().getPersistService();
+ MetaDataPersistService persistService = contextManager.getMetaDataContexts().getPersistService();
return getDisabledStorageNodes(databaseName, persistService).stream()
.collect(Collectors.toMap(QualifiedDatabase::getDataSourceName, QualifiedDatabase::getGroupName, (value1, value2) -> String.join(",", value1, value2)));
}
@@ -134,7 +134,7 @@ public final class AlterReadwriteSplittingStorageUnitStatusStatementHandler exte
private void checkResourceExists(final ContextManager contextManager, final String databaseName, final String toBeDisabledResource) {
Collection<String> notExistedResources = contextManager
- .getMetadataContexts().getMetadata().getDatabase(databaseName).getResourceMetaData().getNotExistedResources(Collections.singleton(toBeDisabledResource));
+ .getMetaDataContexts().getMetaData().getDatabase(databaseName).getResourceMetaData().getNotExistedResources(Collections.singleton(toBeDisabledResource));
ShardingSpherePreconditions.checkState(notExistedResources.isEmpty(), () -> new MissingRequiredResourcesException(databaseName, Collections.singleton(toBeDisabledResource)));
}
@@ -184,7 +184,7 @@ public final class AlterReadwriteSplittingStorageUnitStatusStatementHandler exte
});
}
- private Collection<QualifiedDatabase> getDisabledStorageNodes(final String databaseName, final MetadataPersistService persistService) {
+ private Collection<QualifiedDatabase> getDisabledStorageNodes(final String databaseName, final MetaDataPersistService persistService) {
Map<String, StorageNodeDataSource> storageNodes = new StorageNodeStatusService((ClusterPersistRepository) persistService.getRepository()).loadStorageNodes();
return storageNodes.entrySet().stream().filter(each -> StorageNodeStatus.DISABLED.name().equalsIgnoreCase(each.getValue().getStatus()))
.map(each -> new QualifiedDatabase(each.getKey())).filter(each -> databaseName.equalsIgnoreCase(each.getDatabaseName())).collect(Collectors.toList());
@@ -192,7 +192,7 @@ public final class AlterReadwriteSplittingStorageUnitStatusStatementHandler exte
private Map<String, Map<String, String>> getExportedReadwriteSplittingRules(final ContextManager contextManager, final String databaseName) {
Map<String, Map<String, String>> result = new HashMap<>();
- contextManager.getMetadataContexts().getMetadata().getDatabase(databaseName).getRuleMetaData().findSingleRule(ReadwriteSplittingRule.class)
+ contextManager.getMetaDataContexts().getMetaData().getDatabase(databaseName).getRuleMetaData().findSingleRule(ReadwriteSplittingRule.class)
.filter(each -> new RuleExportEngine(each)
.containExportableKey(Arrays.asList(ExportableConstants.EXPORT_DYNAMIC_READWRITE_SPLITTING_RULE, ExportableConstants.EXPORT_STATIC_READWRITE_SPLITTING_RULE)))
.map(each -> new RuleExportEngine(each).export(Arrays.asList(ExportableConstants.EXPORT_DYNAMIC_READWRITE_SPLITTING_RULE, ExportableConstants.EXPORT_STATIC_READWRITE_SPLITTING_RULE)))
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationHandler.java
index fae32c52f70..9c29d5cde53 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationHandler.java
@@ -36,7 +36,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.proxy.backend.config.yaml.YamlProxyDataSourceConfiguration;
import org.apache.shardingsphere.proxy.backend.config.yaml.YamlProxyDatabaseConfiguration;
import org.apache.shardingsphere.proxy.backend.config.yaml.swapper.YamlProxyDataSourceConfigurationSwapper;
@@ -136,8 +136,8 @@ public final class ImportDatabaseConfigurationHandler extends UpdatableRALBacken
return;
}
Collection<RuleConfiguration> ruleConfigs = new LinkedList<>();
- MetadataContexts metadataContexts = ProxyContext.getInstance().getContextManager().getMetadataContexts();
- ShardingSphereDatabase database = metadataContexts.getMetadata().getDatabase(databaseName);
+ MetaDataContexts metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
+ ShardingSphereDatabase database = metaDataContexts.getMetaData().getDatabase(databaseName);
for (YamlRuleConfiguration each : yamlRuleConfigs) {
if (each instanceof YamlShardingRuleConfiguration) {
ShardingRuleConfiguration shardingRuleConfig = new YamlShardingRuleConfigurationSwapper().swapToObject((YamlShardingRuleConfiguration) each);
@@ -162,8 +162,8 @@ public final class ImportDatabaseConfigurationHandler extends UpdatableRALBacken
}
}
database.getRuleMetaData().getConfigurations().addAll(ruleConfigs);
- ProxyContext.getInstance().getContextManager().renewMetadataContexts(metadataContexts);
- metadataContexts.getPersistService().getDatabaseRulePersistService().persist(metadataContexts.getMetadata().getActualDatabaseName(databaseName), ruleConfigs);
+ ProxyContext.getInstance().getContextManager().renewMetaDataContexts(metaDataContexts);
+ metaDataContexts.getPersistService().getDatabaseRulePersistService().persist(metaDataContexts.getMetaData().getActualDatabaseName(databaseName), ruleConfigs);
}
private void dropDatabase(final String databaseName) {
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LabelComputeNodeHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LabelComputeNodeHandler.java
index 37ad2715bb4..440599f5032 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LabelComputeNodeHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LabelComputeNodeHandler.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.util.exception.ShardingSpherePrecondition
import org.apache.shardingsphere.infra.util.exception.external.sql.type.generic.UnsupportedSQLOperationException;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.LabelsChangedEvent;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.repository.standalone.StandalonePersistRepository;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.UpdatableRALBackendHandler;
@@ -40,7 +40,7 @@ public final class LabelComputeNodeHandler extends UpdatableRALBackendHandler<La
@Override
public void update(final ContextManager contextManager) {
- MetadataPersistService persistService = ProxyContext.getInstance().getContextManager().getMetadataContexts().getPersistService();
+ MetaDataPersistService persistService = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getPersistService();
ShardingSpherePreconditions.checkState(null != persistService && null != persistService.getRepository() && !(persistService.getRepository() instanceof StandalonePersistRepository),
() -> new UnsupportedSQLOperationException("Labels can only be added in cluster mode"));
String instanceId = getSqlStatement().getInstanceId();
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetadataHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetadataHandler.java
index 34dc4359054..481df436615 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetadataHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetadataHandler.java
@@ -34,7 +34,7 @@ public final class RefreshDatabaseMetadataHandler extends UpdatableRALBackendHan
@Override
protected void update(final ContextManager contextManager) {
- contextManager.reloadDatabaseMetadata(getDatabaseName());
+ contextManager.reloadDatabaseMetaData(getDatabaseName());
}
private String getDatabaseName() {
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetadataHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetadataHandler.java
index 51ebd6bc7e0..38ef3ba4f07 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetadataHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetadataHandler.java
@@ -54,7 +54,7 @@ public final class RefreshTableMetadataHandler extends UpdatableRALBackendHandle
if (getSqlStatement().getTableName().isPresent()) {
contextManager.reloadTable(databaseName, schemaName, getSqlStatement().getTableName().get());
} else {
- contextManager.reloadDatabaseMetadata(databaseName);
+ contextManager.reloadDatabaseMetaData(databaseName);
}
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableHandler.java
index c1218b2d359..4bcbf84f967 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableHandler.java
@@ -23,8 +23,8 @@ import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.util.props.TypedPropertyValue;
import org.apache.shardingsphere.infra.util.props.exception.TypedPropertyValueException;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.exception.InvalidValueException;
import org.apache.shardingsphere.proxy.backend.exception.UnsupportedVariableException;
@@ -62,12 +62,12 @@ public final class SetDistVariableHandler extends UpdatableRALBackendHandler<Set
private void handleConfigurationProperty(final ConfigurationPropertyKey propertyKey, final String value) {
ContextManager contextManager = ProxyContext.getInstance().getContextManager();
- MetadataContexts metadataContexts = contextManager.getMetadataContexts();
+ MetaDataContexts metaDataContexts = contextManager.getMetaDataContexts();
Properties props = new Properties();
- props.putAll(metadataContexts.getMetadata().getProps().getProps());
+ props.putAll(metaDataContexts.getMetaData().getProps().getProps());
props.put(propertyKey.getKey(), getValue(propertyKey, value));
contextManager.alterProperties(props);
- MetadataPersistService persistService = metadataContexts.getPersistService();
+ MetaDataPersistService persistService = metaDataContexts.getPersistService();
if (null != persistService.getPropsService()) {
persistService.getPropsService().persist(props);
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlabelComputeNodeHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlabelComputeNodeHandler.java
index fda590ba7e1..085d2dab2f4 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlabelComputeNodeHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlabelComputeNodeHandler.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.util.exception.ShardingSpherePrecondition
import org.apache.shardingsphere.infra.util.exception.external.sql.type.generic.UnsupportedSQLOperationException;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.LabelsChangedEvent;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.repository.standalone.StandalonePersistRepository;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.UpdatableRALBackendHandler;
@@ -41,7 +41,7 @@ public final class UnlabelComputeNodeHandler extends UpdatableRALBackendHandler<
@Override
protected void update(final ContextManager contextManager) {
- MetadataPersistService persistService = ProxyContext.getInstance().getContextManager().getMetadataContexts().getPersistService();
+ MetaDataPersistService persistService = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getPersistService();
ShardingSpherePreconditions.checkState(null != persistService.getRepository() && !(persistService.getRepository() instanceof StandalonePersistRepository),
() -> new UnsupportedSQLOperationException("Labels can only be removed in cluster mode"));
String instanceId = getSqlStatement().getInstanceId();
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandler.java
index d7b037c2fad..6819d1a1d2e 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandler.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.infra.distsql.update.RuleDefinitionUpdater;
import org.apache.shardingsphere.infra.distsql.update.RuleDefinitionUpdaterFactory;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.util.exception.external.sql.type.generic.UnsupportedSQLOperationException;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.handler.DatabaseRequiredBackendHandler;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
@@ -122,8 +122,8 @@ public final class RuleDefinitionBackendHandler<T extends RuleDefinitionStatemen
}
private void persistRuleConfigurationChange(final String databaseName, final Collection<RuleConfiguration> alteredConfigs) {
- MetadataContexts metadataContexts = ProxyContext.getInstance().getContextManager().getMetadataContexts();
- metadataContexts.getPersistService().getDatabaseRulePersistService().persist(metadataContexts.getMetadata().getActualDatabaseName(databaseName), alteredConfigs);
+ MetaDataContexts metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
+ metaDataContexts.getPersistService().getDatabaseRulePersistService().persist(metaDataContexts.getMetaData().getActualDatabaseName(databaseName), alteredConfigs);
}
private boolean getRefreshStatus(final SQLStatement sqlStatement, final RuleConfiguration currentRuleConfig, final RuleDefinitionUpdater<?, ?> updater) {
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLHandler.java
index d9f4beb7bab..9e617ba5457 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLHandler.java
@@ -50,7 +50,7 @@ public final class ParseDistSQLHandler extends SQLRULBackendHandler<ParseStateme
}
private SQLStatement parseSQL(final ContextManager contextManager) {
- SQLParserRule sqlParserRule = contextManager.getMetadataContexts().getMetadata().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
+ SQLParserRule sqlParserRule = contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
String databaseType = getConnectionSession().getProtocolType().getType();
return sqlParserRule.getSQLParserEngine(databaseType).parse(getSqlStatement().getSql(), false);
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/PreviewHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/PreviewHandler.java
index 2a60eea205b..010cd3b3602 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/PreviewHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/PreviewHandler.java
@@ -52,7 +52,7 @@ import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRule
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.JDBCBackendConnection;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.statement.JDBCBackendStatement;
@@ -94,13 +94,13 @@ public final class PreviewHandler extends SQLRULBackendHandler<PreviewStatement>
@Override
protected Collection<LocalDataQueryResultRow> getRows(final ContextManager contextManager) throws SQLException {
- MetadataContexts metadataContexts = ProxyContext.getInstance().getContextManager().getMetadataContexts();
+ MetaDataContexts metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
String databaseName = getDatabaseName();
- String databaseType = DatabaseTypeEngine.getTrunkDatabaseTypeName(metadataContexts.getMetadata().getDatabase(databaseName).getProtocolType());
- ShardingSphereRuleMetaData globalRuleMetaData = metadataContexts.getMetadata().getGlobalRuleMetaData();
+ String databaseType = DatabaseTypeEngine.getTrunkDatabaseTypeName(metaDataContexts.getMetaData().getDatabase(databaseName).getProtocolType());
+ ShardingSphereRuleMetaData globalRuleMetaData = metaDataContexts.getMetaData().getGlobalRuleMetaData();
SQLParserRule sqlParserRule = globalRuleMetaData.getSingleRule(SQLParserRule.class);
SQLStatement previewedStatement = sqlParserRule.getSQLParserEngine(databaseType).parse(getSqlStatement().getSql(), false);
- SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(metadataContexts.getMetadata(), previewedStatement, databaseName);
+ SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(metaDataContexts.getMetaData(), previewedStatement, databaseName);
QueryContext queryContext = new QueryContext(sqlStatementContext, getSqlStatement().getSql(), Collections.emptyList());
getConnectionSession().setQueryContext(queryContext);
if (sqlStatementContext instanceof CursorAvailable && sqlStatementContext instanceof CursorDefinitionAware) {
@@ -108,9 +108,9 @@ public final class PreviewHandler extends SQLRULBackendHandler<PreviewStatement>
}
ShardingSphereDatabase database = ProxyContext.getInstance().getDatabase(getConnectionSession().getDatabaseName());
ShardingSpherePreconditions.checkState(database.isComplete(), () -> new RuleNotExistedException(getConnectionSession().getDatabaseName()));
- ConfigurationProperties props = metadataContexts.getMetadata().getProps();
- SQLFederationDeciderContext deciderContext = decide(queryContext, props, metadataContexts.getMetadata().getDatabase(getConnectionSession().getDatabaseName()));
- Collection<ExecutionUnit> executionUnits = deciderContext.isUseSQLFederation() ? getFederationExecutionUnits(queryContext, databaseName, metadataContexts)
+ ConfigurationProperties props = metaDataContexts.getMetaData().getProps();
+ SQLFederationDeciderContext deciderContext = decide(queryContext, props, metaDataContexts.getMetaData().getDatabase(getConnectionSession().getDatabaseName()));
+ Collection<ExecutionUnit> executionUnits = deciderContext.isUseSQLFederation() ? getFederationExecutionUnits(queryContext, databaseName, metaDataContexts)
: kernelProcessor.generateExecutionContext(queryContext, database, globalRuleMetaData, props, getConnectionSession().getConnectionContext()).getExecutionUnits();
return executionUnits.stream().map(this::buildRow).collect(Collectors.toList());
}
@@ -134,17 +134,17 @@ public final class PreviewHandler extends SQLRULBackendHandler<PreviewStatement>
return new LocalDataQueryResultRow(unit.getDataSourceName(), unit.getSqlUnit().getSql());
}
- private Collection<ExecutionUnit> getFederationExecutionUnits(final QueryContext queryContext, final String databaseName, final MetadataContexts metadataContexts) throws SQLException {
+ private Collection<ExecutionUnit> getFederationExecutionUnits(final QueryContext queryContext, final String databaseName, final MetaDataContexts metaDataContexts) throws SQLException {
SQLStatement sqlStatement = queryContext.getSqlStatementContext().getSqlStatement();
boolean isReturnGeneratedKeys = sqlStatement instanceof MySQLInsertStatement;
- DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine = createDriverExecutionPrepareEngine(isReturnGeneratedKeys, metadataContexts);
- SQLFederationExecutorContext context = new SQLFederationExecutorContext(true, queryContext, metadataContexts.getMetadata());
- ShardingSphereDatabase database = metadataContexts.getMetadata().getDatabase(getDatabaseName());
+ DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine = createDriverExecutionPrepareEngine(isReturnGeneratedKeys, metaDataContexts);
+ SQLFederationExecutorContext context = new SQLFederationExecutorContext(true, queryContext, metaDataContexts.getMetaData());
+ ShardingSphereDatabase database = metaDataContexts.getMetaData().getDatabase(getDatabaseName());
String schemaName = queryContext.getSqlStatementContext().getTablesContext().getSchemaName().orElseGet(() -> DatabaseTypeEngine.getDefaultSchemaName(database.getProtocolType(), databaseName));
EventBusContext eventBusContext = ProxyContext.getInstance().getContextManager().getInstanceContext().getEventBusContext();
- SQLFederationRule sqlFederationRule = metadataContexts.getMetadata().getGlobalRuleMetaData().getSingleRule(SQLFederationRule.class);
+ SQLFederationRule sqlFederationRule = metaDataContexts.getMetaData().getGlobalRuleMetaData().getSingleRule(SQLFederationRule.class);
SQLFederationExecutor sqlFederationExecutor = sqlFederationRule.getSQLFederationExecutor(databaseName, schemaName,
- metadataContexts.getMetadata(), metadataContexts.getShardingSphereData(),
+ metaDataContexts.getMetaData(), metaDataContexts.getShardingSphereData(),
new JDBCExecutor(BackendExecutorContext.getInstance().getExecutorEngine(), getConnectionSession().getConnectionContext()), eventBusContext);
sqlFederationExecutor.executeQuery(prepareEngine, createPreviewFederationCallback(database.getProtocolType(), database.getResourceMetaData().getStorageTypes(), sqlStatement, eventBusContext),
context);
@@ -167,12 +167,12 @@ public final class PreviewHandler extends SQLRULBackendHandler<PreviewStatement>
};
}
- private DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> createDriverExecutionPrepareEngine(final boolean isReturnGeneratedKeys, final MetadataContexts metadataContexts) {
- int maxConnectionsSizePerQuery = metadataContexts.getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY);
+ private DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> createDriverExecutionPrepareEngine(final boolean isReturnGeneratedKeys, final MetaDataContexts metaDataContexts) {
+ int maxConnectionsSizePerQuery = metaDataContexts.getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY);
return new DriverExecutionPrepareEngine<>(JDBCDriverType.STATEMENT, maxConnectionsSizePerQuery, (JDBCBackendConnection) getConnectionSession().getBackendConnection(),
(JDBCBackendStatement) getConnectionSession().getStatementManager(), new StatementOption(isReturnGeneratedKeys),
- metadataContexts.getMetadata().getDatabase(getDatabaseName()).getRuleMetaData().getRules(),
- metadataContexts.getMetadata().getDatabase(getDatabaseName()).getResourceMetaData().getStorageTypes());
+ metaDataContexts.getMetaData().getDatabase(getDatabaseName()).getRuleMetaData().getRules(),
+ metaDataContexts.getMetaData().getDatabase(getDatabaseName()).getResourceMetaData().getStorageTypes());
}
private String getDatabaseName() {
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/session/ConnectionSession.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/session/ConnectionSession.java
index 2e86127c9b8..29600d3d4bf 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/session/ConnectionSession.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/session/ConnectionSession.java
@@ -92,12 +92,12 @@ public final class ConnectionSession {
}
private BackendConnection determineBackendConnection() {
- String proxyBackendDriverType = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().getValue(ConfigurationPropertyKey.PROXY_BACKEND_DRIVER_TYPE);
+ String proxyBackendDriverType = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().getValue(ConfigurationPropertyKey.PROXY_BACKEND_DRIVER_TYPE);
return "ExperimentalVertx".equals(proxyBackendDriverType) ? new VertxBackendConnection(this) : new JDBCBackendConnection(this);
}
private ExecutorStatementManager determineStatementManager() {
- String proxyBackendDriverType = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().getValue(ConfigurationPropertyKey.PROXY_BACKEND_DRIVER_TYPE);
+ String proxyBackendDriverType = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().getValue(ConfigurationPropertyKey.PROXY_BACKEND_DRIVER_TYPE);
return "ExperimentalVertx".equals(proxyBackendDriverType) ? new VertxBackendStatement() : new JDBCBackendStatement();
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineFactoryTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineFactoryTest.java
index 9029d9bc0a5..4626e5bbeaf 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineFactoryTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineFactoryTest.java
@@ -25,8 +25,8 @@ import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.JDBCBackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer;
@@ -48,10 +48,10 @@ public final class DatabaseCommunicationEngineFactoryTest extends ProxyContextRe
@Before
public void setUp() {
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(getDatabases(), mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new Properties())));
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutorTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutorTest.java
index 293907ad905..77e1134e915 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutorTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutorTest.java
@@ -36,8 +36,8 @@ import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRule
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.JDBCDatabaseCommunicationEngine;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.JDBCBackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
@@ -85,8 +85,8 @@ public final class ProxySQLExecutorTest extends ProxyContextRestorer {
when(connectionSession.getTransactionStatus().isInTransaction()).thenReturn(true);
when(connectionSession.getBackendConnection()).thenReturn(backendConnection);
when(backendConnection.getConnectionSession()).thenReturn(connectionSession);
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class), new ShardingSphereMetaData());
- ProxyContext.init(new ContextManager(metadataContexts, mock(InstanceContext.class)));
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class), new ShardingSphereMetaData());
+ ProxyContext.init(new ContextManager(metaDataContexts, mock(InstanceContext.class)));
}
@Test(expected = TableModifyInTransactionException.class)
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngineTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngineTest.java
index 72e3683b8b0..32bce1d9328 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngineTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngineTest.java
@@ -42,8 +42,8 @@ import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.
import org.apache.shardingsphere.infra.metadata.database.schema.util.SystemSchemaUtil;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.communication.DatabaseCommunicationEngine;
import org.apache.shardingsphere.proxy.backend.communication.DatabaseCommunicationEngineFactory;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.JDBCBackendConnection;
@@ -114,10 +114,10 @@ public final class JDBCDatabaseCommunicationEngineTest extends ProxyContextResto
@Before
public void setUp() {
when(backendConnection.getConnectionSession().getDatabaseName()).thenReturn("db");
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(mockDatabases(), globalRuleMetaData, new ConfigurationProperties(new Properties())));
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/JDBCBackendConnectionTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/JDBCBackendConnectionTest.java
index 8688e0cc903..eda71cbbd4d 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/JDBCBackendConnectionTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/JDBCBackendConnectionTest.java
@@ -26,8 +26,8 @@ import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.JDBCDatabaseCommunicationEngine;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.datasource.JDBCBackendDataSource;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.statement.JDBCBackendStatement;
@@ -109,9 +109,9 @@ public final class JDBCBackendConnectionTest extends ProxyContextRestorer {
private void setContextManager() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(createDatabases(), mockGlobalRuleMetaData(), new ConfigurationProperties(new Properties())));
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSourceTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSourceTest.java
index ceeeaa8db38..7d6a90645a2 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSourceTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSourceTest.java
@@ -27,8 +27,8 @@ import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.datasource.fixture.CallTimeRecordDataSource;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer;
@@ -68,9 +68,9 @@ public final class JDBCBackendDataSourceTest extends ProxyContextRestorer {
@Before
public void setUp() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(createDatabases(), mockGlobalRuleMetaData(), new ConfigurationProperties(new Properties())));
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/impl/MySQLStatementMemoryStrictlyFetchSizeSetterTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/impl/MySQLStatementMemoryStrictlyFetchSizeSetterTest.java
index eba863fa253..a48cc6a090e 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/impl/MySQLStatementMemoryStrictlyFetchSizeSetterTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/impl/MySQLStatementMemoryStrictlyFetchSizeSetterTest.java
@@ -37,13 +37,13 @@ public final class MySQLStatementMemoryStrictlyFetchSizeSetterTest extends Proxy
@Before
public void setUp() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts().getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_BACKEND_QUERY_FETCH_SIZE)).thenReturn(-1);
+ when(contextManager.getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_BACKEND_QUERY_FETCH_SIZE)).thenReturn(-1);
ProxyContext.init(contextManager);
}
@Test
public void assertSetFetchSize() throws SQLException {
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_BACKEND_QUERY_FETCH_SIZE)).thenReturn(-1);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_BACKEND_QUERY_FETCH_SIZE)).thenReturn(-1);
Statement statement = mock(Statement.class);
new MySQLStatementMemoryStrictlyFetchSizeSetter().setFetchSize(statement);
verify(statement).setFetchSize(Integer.MIN_VALUE);
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/impl/OpenGaussStatementMemoryStrictlyFetchSizeSetterTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/impl/OpenGaussStatementMemoryStrictlyFetchSizeSetterTest.java
index dbe26bfadf3..65c879c0bd1 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/impl/OpenGaussStatementMemoryStrictlyFetchSizeSetterTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/impl/OpenGaussStatementMemoryStrictlyFetchSizeSetterTest.java
@@ -37,7 +37,7 @@ public final class OpenGaussStatementMemoryStrictlyFetchSizeSetterTest extends P
@Before
public void setUp() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts().getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_BACKEND_QUERY_FETCH_SIZE)).thenReturn(-1);
+ when(contextManager.getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_BACKEND_QUERY_FETCH_SIZE)).thenReturn(-1);
ProxyContext.init(contextManager);
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/impl/PostgreSQLStatementMemoryStrictlyFetchSizeSetterTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/impl/PostgreSQLStatementMemoryStrictlyFetchSizeSetterTest.java
index 300ea6c9c32..6b57e796f21 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/impl/PostgreSQLStatementMemoryStrictlyFetchSizeSetterTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/impl/PostgreSQLStatementMemoryStrictlyFetchSizeSetterTest.java
@@ -37,7 +37,7 @@ public final class PostgreSQLStatementMemoryStrictlyFetchSizeSetterTest extends
@Before
public void setUp() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts().getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_BACKEND_QUERY_FETCH_SIZE)).thenReturn(-1);
+ when(contextManager.getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_BACKEND_QUERY_FETCH_SIZE)).thenReturn(-1);
ProxyContext.init(contextManager);
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/JDBCBackendTransactionManagerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/JDBCBackendTransactionManagerTest.java
index 066a725de27..ab39022b51d 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/JDBCBackendTransactionManagerTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/JDBCBackendTransactionManagerTest.java
@@ -80,7 +80,7 @@ public final class JDBCBackendTransactionManagerTest extends ProxyContextRestore
private void setTransactionContexts() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
ShardingSphereRuleMetaData globalRuleMetaData = mockGlobalRuleMetaData();
- when(contextManager.getMetadataContexts().getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
ProxyContext.init(contextManager);
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/context/BackendExecutorContextTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/context/BackendExecutorContextTest.java
index e04549d6f72..80d89da955a 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/context/BackendExecutorContextTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/context/BackendExecutorContextTest.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.proxy.backend.context;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer;
import org.junit.Before;
import org.junit.Test;
@@ -35,9 +35,9 @@ public final class BackendExecutorContextTest extends ProxyContextRestorer {
@Before
public void setUp() {
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class), new ShardingSphereMetaData());
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class), new ShardingSphereMetaData());
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java
index 4a616c6c7c1..8f97ec03246 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java
@@ -25,8 +25,8 @@ import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer;
import org.junit.Test;
@@ -50,9 +50,9 @@ public final class ProxyContextTest extends ProxyContextRestorer {
@Test
public void assertInit() {
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class), new ShardingSphereMetaData());
- ProxyContext.init(new ContextManager(metadataContexts, mock(InstanceContext.class, RETURNS_DEEP_STUBS)));
- assertThat(ProxyContext.getInstance().getContextManager().getMetadataContexts(), is(ProxyContext.getInstance().getContextManager().getMetadataContexts()));
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class), new ShardingSphereMetaData());
+ ProxyContext.init(new ContextManager(metaDataContexts, mock(InstanceContext.class, RETURNS_DEEP_STUBS)));
+ assertThat(ProxyContext.getInstance().getContextManager().getMetaDataContexts(), is(ProxyContext.getInstance().getContextManager().getMetaDataContexts()));
assertTrue(ProxyContext.getInstance().getStateContext().isPresent());
assertThat(ProxyContext.getInstance().getStateContext(), is(ProxyContext.getInstance().getStateContext()));
}
@@ -61,9 +61,9 @@ public final class ProxyContextTest extends ProxyContextRestorer {
public void assertDatabaseExists() {
Map<String, ShardingSphereDatabase> databases = mockDatabases();
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(databases, mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new Properties())));
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
assertTrue(ProxyContext.getInstance().databaseExists("db"));
assertFalse(ProxyContext.getInstance().databaseExists("db_1"));
@@ -83,9 +83,9 @@ public final class ProxyContextTest extends ProxyContextRestorer {
public void assertGetDatabaseWhenNotExisted() {
Map<String, ShardingSphereDatabase> databases = mockDatabases();
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(databases, mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new Properties())));
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
ProxyContext.getInstance().getDatabase("db1");
}
@@ -94,9 +94,9 @@ public final class ProxyContextTest extends ProxyContextRestorer {
public void assertGetDatabase() {
Map<String, ShardingSphereDatabase> databases = mockDatabases();
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(databases, mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new Properties())));
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
assertThat(databases.get("db"), is(ProxyContext.getInstance().getDatabase("db")));
}
@@ -105,9 +105,9 @@ public final class ProxyContextTest extends ProxyContextRestorer {
public void assertGetAllDatabaseNames() {
Map<String, ShardingSphereDatabase> databases = createDatabases();
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(databases, mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new Properties())));
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
assertThat(new LinkedHashSet<>(ProxyContext.getInstance().getAllDatabaseNames()), is(databases.keySet()));
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java
index 21e0f33bb39..6e5ba757cf2 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.util.exception.external.sql.type.generic.UnsupportedSQLOperationException;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.parser.config.SQLParserRuleConfiguration;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import org.apache.shardingsphere.proxy.backend.communication.DatabaseCommunicationEngine;
@@ -85,15 +85,15 @@ public final class ProxyBackendHandlerFactoryTest extends ProxyContextRestorer {
when(connectionSession.getDefaultDatabaseName()).thenReturn("db");
when(connectionSession.getBackendConnection()).thenReturn(backendConnection);
when(backendConnection.getConnectionSession()).thenReturn(connectionSession);
- MetadataContexts metadataContexts = mock(MetadataContexts.class, RETURNS_DEEP_STUBS);
- mockGlobalRuleMetaData(metadataContexts);
+ MetaDataContexts metaDataContexts = mock(MetaDataContexts.class, RETURNS_DEEP_STUBS);
+ mockGlobalRuleMetaData(metaDataContexts);
ShardingSphereDatabase database = mockDatabase();
- when(metadataContexts.getMetadata().getDatabase("db")).thenReturn(database);
+ when(metaDataContexts.getMetaData().getDatabase("db")).thenReturn(database);
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
- when(metadataContexts.getMetadata().getProps()).thenReturn(new ConfigurationProperties(new Properties()));
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
+ when(metaDataContexts.getMetaData().getProps()).thenReturn(new ConfigurationProperties(new Properties()));
CacheOption cacheOption = new CacheOption(1024, 1024);
- when(metadataContexts.getMetadata().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class)).thenReturn(new SQLParserRule(new SQLParserRuleConfiguration(true, cacheOption, cacheOption)));
+ when(metaDataContexts.getMetaData().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class)).thenReturn(new SQLParserRule(new SQLParserRuleConfiguration(true, cacheOption, cacheOption)));
ProxyContext.init(contextManager);
}
@@ -104,12 +104,12 @@ public final class ProxyBackendHandlerFactoryTest extends ProxyContextRestorer {
return result;
}
- private void mockGlobalRuleMetaData(final MetadataContexts metadataContexts) {
+ private void mockGlobalRuleMetaData(final MetaDataContexts metaDataContexts) {
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
TransactionRule transactionRule = mock(TransactionRule.class);
when(transactionRule.getResource()).thenReturn(new ShardingSphereTransactionManagerEngine());
when(globalRuleMetaData.getSingleRule(TransactionRule.class)).thenReturn(transactionRule);
- when(metadataContexts.getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(metaDataContexts.getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
}
@Test
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminQueryBackendHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminQueryBackendHandlerTest.java
index 8dfb67b2682..d91ddcb2d50 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminQueryBackendHandlerTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminQueryBackendHandlerTest.java
@@ -27,8 +27,8 @@ import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.handler.admin.postgresql.executor.SelectTableExecutor;
import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
@@ -57,9 +57,9 @@ public final class DatabaseAdminQueryBackendHandlerTest extends ProxyContextRest
@Before
public void before() throws SQLException {
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(getDatabases(), mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new Properties())));
- ContextManager contextManager = new ContextManager(metadataContexts, mock(InstanceContext.class));
+ ContextManager contextManager = new ContextManager(metaDataContexts, mock(InstanceContext.class));
ProxyContext.init(contextManager);
ConnectionSession connectionSession = mock(ConnectionSession.class);
when(connectionSession.getDatabaseName()).thenReturn("db");
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseOperateBackendHandlerFactoryTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseOperateBackendHandlerFactoryTest.java
index 7b31f08b564..67338b9311e 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseOperateBackendHandlerFactoryTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseOperateBackendHandlerFactoryTest.java
@@ -24,8 +24,8 @@ import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.handler.database.DatabaseOperateBackendHandlerFactory;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
@@ -71,12 +71,12 @@ public final class DatabaseOperateBackendHandlerFactoryTest extends ProxyContext
@Before
public void setUp() {
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(getDatabases(), mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new Properties())));
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
when(connectionSession.getDatabaseName()).thenReturn("db");
- when(metadataContexts.getMetadata().getGlobalRuleMetaData().getRules()).thenReturn(Collections.emptyList());
+ when(metaDataContexts.getMetaData().getGlobalRuleMetaData().getRules()).thenReturn(Collections.emptyList());
}
@Test
@@ -144,16 +144,16 @@ public final class DatabaseOperateBackendHandlerFactoryTest extends ProxyContext
private void setGovernanceMetaDataContexts(final boolean isGovernance) {
ContextManager contextManager = ProxyContext.getInstance().getContextManager();
- MetadataContexts metadataContexts = isGovernance
+ MetaDataContexts metaDataContexts = isGovernance
? mockMetaDataContexts()
- : new MetadataContexts(mock(MetadataPersistService.class), new ShardingSphereMetaData());
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ : new MetaDataContexts(mock(MetaDataPersistService.class), new ShardingSphereMetaData());
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
}
- private MetadataContexts mockMetaDataContexts() {
- MetadataContexts result = ProxyContext.getInstance().getContextManager().getMetadataContexts();
- when(result.getMetadata().getDatabase("db").getResourceMetaData().getDataSources()).thenReturn(Collections.emptyMap());
- when(result.getMetadata().getDatabase("db").getResourceMetaData().getNotExistedResources(any())).thenReturn(Collections.emptyList());
+ private MetaDataContexts mockMetaDataContexts() {
+ MetaDataContexts result = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
+ when(result.getMetaData().getDatabase("db").getResourceMetaData().getDataSources()).thenReturn(Collections.emptyMap());
+ when(result.getMetaData().getDatabase("db").getResourceMetaData().getNotExistedResources(any())).thenReturn(Collections.emptyList());
return result;
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetadataExecutorTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetadataExecutorTest.java
index 7e62f5cb100..4e753e684b5 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetadataExecutorTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetadataExecutorTest.java
@@ -27,8 +27,8 @@ import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphere
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetadataExecutor.DefaultDatabaseMetadataExecutor;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
@@ -76,9 +76,9 @@ public final class DefaultDatabaseMetadataExecutorTest extends ProxyContextResto
AuthorityRule authorityRule = mock(AuthorityRule.class);
when(authorityRule.findPrivileges(grantee)).thenReturn(Optional.of(new DatabasePermittedPrivileges(Collections.singleton("auth_db"))));
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class), new ShardingSphereMetaData(new HashMap<>(),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class), new ShardingSphereMetaData(new HashMap<>(),
new ShardingSphereRuleMetaData(Collections.singleton(authorityRule)), new ConfigurationProperties(new Properties())));
- when(result.getMetadataContexts()).thenReturn(metadataContexts);
+ when(result.getMetaDataContexts()).thenReturn(metaDataContexts);
return result;
}
@@ -87,7 +87,7 @@ public final class DefaultDatabaseMetadataExecutorTest extends ProxyContextResto
Map<String, String> expectedResultSetMap = new HashMap<>(2, 1);
expectedResultSetMap.put("sn", "foo_ds");
expectedResultSetMap.put("DEFAULT_CHARACTER_SET_NAME", "utf8mb4");
- ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabases().put("auth_db", createDatabase(expectedResultSetMap));
+ ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases().put("auth_db", createDatabase(expectedResultSetMap));
String sql = "SELECT SCHEMA_NAME AS sn, DEFAULT_CHARACTER_SET_NAME FROM information_schema.SCHEMATA";
DefaultDatabaseMetadataExecutor executor = new DefaultDatabaseMetadataExecutor(sql);
executor.execute(connectionSession);
@@ -97,7 +97,7 @@ public final class DefaultDatabaseMetadataExecutorTest extends ProxyContextResto
@Test
public void assertExecuteWithDefaultValue() throws SQLException {
- ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabases().put("auth_db", createDatabase(Collections.singletonMap("support_ndb", "0")));
+ ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases().put("auth_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/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLAdminExecutorCreatorTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLAdminExecutorCreatorTest.java
index cd643ec4ba5..7486d4b8298 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLAdminExecutorCreatorTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLAdminExecutorCreatorTest.java
@@ -25,8 +25,8 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetadataExecutor;
import org.apache.shardingsphere.proxy.backend.handler.admin.executor.DatabaseAdminExecutor;
@@ -342,9 +342,9 @@ public final class MySQLAdminExecutorCreatorTest extends ProxyContextRestorer {
private void initProxyContext(final Map<String, ShardingSphereDatabase> databases) {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(databases, mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new Properties())));
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLSetVariableAdminExecutorTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLSetVariableAdminExecutorTest.java
index 8c5c2c3efe7..c492608c1f5 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLSetVariableAdminExecutorTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLSetVariableAdminExecutorTest.java
@@ -56,9 +56,9 @@ public final class MySQLSetVariableAdminExecutorTest extends ProxyContextRestore
when(connectionSession.getBackendConnection()).thenReturn(backendConnection);
when(backendConnection.getConnectionSession()).thenReturn(connectionSession);
ProxyContext.init(mock(ContextManager.class, RETURNS_DEEP_STUBS));
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase("db")).thenReturn(mock(ShardingSphereDatabase.class));
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().containsDatabase("db")).thenReturn(true);
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData())
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase("db")).thenReturn(mock(ShardingSphereDatabase.class));
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().containsDatabase("db")).thenReturn(true);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData())
.thenReturn(new ShardingSphereRuleMetaData(Collections.singletonList(new SQLParserRule(new SQLParserRuleConfiguration(false, new CacheOption(1, 1), new CacheOption(1, 1))))));
try (MockedConstruction<JDBCDatabaseCommunicationEngine> mockConstruction = mockConstruction(JDBCDatabaseCommunicationEngine.class)) {
executor.execute(connectionSession);
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowCreateDatabaseExecutorTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowCreateDatabaseExecutorTest.java
index 250776ecc6e..fc4b6f9d601 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowCreateDatabaseExecutorTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowCreateDatabaseExecutorTest.java
@@ -24,8 +24,8 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer;
@@ -51,10 +51,10 @@ public final class ShowCreateDatabaseExecutorTest extends ProxyContextRestorer {
@Before
public void setUp() {
Map<String, ShardingSphereDatabase> databases = getDatabases();
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(databases, mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new Properties())));
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowCurrentUserExecutorTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowCurrentUserExecutorTest.java
index 0bf03c0821f..6d4ed8153aa 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowCurrentUserExecutorTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowCurrentUserExecutorTest.java
@@ -24,8 +24,8 @@ import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRule
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer;
@@ -51,9 +51,9 @@ public final class ShowCurrentUserExecutorTest extends ProxyContextRestorer {
@Before
public void setUp() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(new HashMap<>(), mockShardingSphereRuleMetaData(), new ConfigurationProperties(new Properties())));
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowDatabasesExecutorTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowDatabasesExecutorTest.java
index 2ec211e5605..411dd64d857 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowDatabasesExecutorTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowDatabasesExecutorTest.java
@@ -24,8 +24,8 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer;
@@ -59,9 +59,9 @@ public final class ShowDatabasesExecutorTest extends ProxyContextRestorer {
public void setUp() {
showDatabasesExecutor = new ShowDatabasesExecutor(new MySQLShowDatabasesStatement());
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(getDatabases(), mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new Properties())));
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowFunctionStatusExecutorTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowFunctionStatusExecutorTest.java
index 39a0f176c34..00e8b1e477a 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowFunctionStatusExecutorTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowFunctionStatusExecutorTest.java
@@ -24,8 +24,8 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer;
@@ -54,10 +54,10 @@ public final class ShowFunctionStatusExecutorTest extends ProxyContextRestorer {
public void setUp() {
showFunctionStatusExecutor = new ShowFunctionStatusExecutor(new MySQLShowFunctionStatusStatement());
Map<String, ShardingSphereDatabase> databases = getDatabases();
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(databases, mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new Properties())));
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowProcedureStatusExecutorTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowProcedureStatusExecutorTest.java
index 2a0af7dd053..28dd7acf2e6 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowProcedureStatusExecutorTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowProcedureStatusExecutorTest.java
@@ -24,8 +24,8 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer;
@@ -51,10 +51,10 @@ public final class ShowProcedureStatusExecutorTest extends ProxyContextRestorer
@Before
public void setUp() {
Map<String, ShardingSphereDatabase> databases = getDatabases();
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(databases, mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new Properties())));
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowTablesExecutorTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowTablesExecutorTest.java
index db967c2f9f8..450846eccc1 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowTablesExecutorTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowTablesExecutorTest.java
@@ -29,8 +29,8 @@ import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereTable;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer;
@@ -64,10 +64,10 @@ public final class ShowTablesExecutorTest extends ProxyContextRestorer {
@Before
public void setUp() {
Map<String, ShardingSphereDatabase> databases = getDatabases();
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(databases, mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new Properties())));
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/UseDatabaseExecutorTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/UseDatabaseExecutorTest.java
index 0832b031904..98971fb208d 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/UseDatabaseExecutorTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/UseDatabaseExecutorTest.java
@@ -24,8 +24,8 @@ import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer;
@@ -58,9 +58,9 @@ public final class UseDatabaseExecutorTest extends ProxyContextRestorer {
@Before
public void setUp() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(getDatabases(), mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new Properties())));
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
@@ -80,9 +80,9 @@ public final class UseDatabaseExecutorTest extends ProxyContextRestorer {
MySQLUseStatement useStatement = mock(MySQLUseStatement.class);
when(useStatement.getSchema()).thenReturn(String.format(DATABASE_PATTERN, 0));
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(getDatabases(), mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new Properties())));
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
UseDatabaseExecutor useSchemaBackendHandler = new UseDatabaseExecutor(useStatement);
useSchemaBackendHandler.execute(connectionSession);
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/information/SelectInformationSchemataExecutorTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/information/SelectInformationSchemataExecutorTest.java
index 7508b7c2544..cc847f114ba 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/information/SelectInformationSchemataExecutorTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/information/SelectInformationSchemataExecutorTest.java
@@ -27,8 +27,8 @@ import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphere
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import org.apache.shardingsphere.parser.rule.builder.DefaultSQLParserRuleConfigurationBuilder;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
@@ -85,15 +85,15 @@ public final class SelectInformationSchemataExecutorTest extends ProxyContextRes
AuthorityRule authorityRule = mock(AuthorityRule.class);
when(authorityRule.findPrivileges(grantee)).thenReturn(Optional.of(new DatabasePermittedPrivileges(Collections.singleton("auth_db"))));
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class), new ShardingSphereMetaData(new HashMap<>(),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class), new ShardingSphereMetaData(new HashMap<>(),
new ShardingSphereRuleMetaData(Collections.singleton(authorityRule)), new ConfigurationProperties(new Properties())));
- when(result.getMetadataContexts()).thenReturn(metadataContexts);
+ when(result.getMetaDataContexts()).thenReturn(metaDataContexts);
return result;
}
@Test
public void assertExecuteWithUnauthorizedDatabase() throws SQLException {
- ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabases().put("no_auth_db", createDatabase("no_auth_db"));
+ ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases().put("no_auth_db", createDatabase("no_auth_db"));
SelectInformationSchemataExecutor executor = new SelectInformationSchemataExecutor(statement, sql);
executor.execute(connectionSession);
assertThat(executor.getQueryResultMetaData().getColumnCount(), is(0));
@@ -105,7 +105,7 @@ public final class SelectInformationSchemataExecutorTest extends ProxyContextRes
Map<String, String> expectedResultSetMap = new HashMap<>(2, 1);
expectedResultSetMap.put("SCHEMA_NAME", "foo_ds");
expectedResultSetMap.put("DEFAULT_COLLATION_NAME", "utf8mb4");
- ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabases().put("auth_db", createDatabase(expectedResultSetMap));
+ ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases().put("auth_db", createDatabase(expectedResultSetMap));
SelectInformationSchemataExecutor executor = new SelectInformationSchemataExecutor(statement, sql);
executor.execute(connectionSession);
assertThat(executor.getQueryResultMetaData().getColumnCount(), is(2));
@@ -117,7 +117,7 @@ public final class SelectInformationSchemataExecutorTest extends ProxyContextRes
@Test
public void assertExecuteWithAuthorizedDatabaseAndEmptyResource() throws SQLException {
- ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabases().put("auth_db", createDatabase("auth_db"));
+ ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases().put("auth_db", createDatabase("auth_db"));
SelectInformationSchemataExecutor executor = new SelectInformationSchemataExecutor(statement, sql);
executor.execute(connectionSession);
assertThat(executor.getQueryResultMetaData().getColumnCount(), is(2));
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectDatabaseExecutorTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectDatabaseExecutorTest.java
index 88dd1bbb4ee..c402383cb14 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectDatabaseExecutorTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectDatabaseExecutorTest.java
@@ -24,8 +24,8 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import org.apache.shardingsphere.parser.rule.builder.DefaultSQLParserRuleConfigurationBuilder;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
@@ -61,9 +61,9 @@ public final class SelectDatabaseExecutorTest extends ProxyContextRestorer {
@Before
public void setUp() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(new HashMap<>(), mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new Properties())));
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
@@ -94,14 +94,14 @@ public final class SelectDatabaseExecutorTest extends ProxyContextRestorer {
}
private void addShardingDatabase() throws SQLException {
- Map<String, ShardingSphereDatabase> databases = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabases();
+ Map<String, ShardingSphereDatabase> databases = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases();
databases.put("sharding_db", new ShardingSphereDatabase("sharding_db", new PostgreSQLDatabaseType(),
new ShardingSphereResourceMetaData("sharding_db", Collections.singletonMap("foo_ds", new MockedDataSource(mockConnection()))), mock(ShardingSphereRuleMetaData.class),
Collections.emptyMap()));
}
private void addEmptyDatabase() {
- Map<String, ShardingSphereDatabase> databases = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabases();
+ Map<String, ShardingSphereDatabase> databases = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases();
databases.put("empty_db", new ShardingSphereDatabase("empty_db", new PostgreSQLDatabaseType(),
new ShardingSphereResourceMetaData("sharding_db", Collections.emptyMap()), new ShardingSphereRuleMetaData(Collections.emptyList()), Collections.emptyMap()));
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectTableExecutorTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectTableExecutorTest.java
index b8cabe70864..77999d1b7ba 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectTableExecutorTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectTableExecutorTest.java
@@ -26,8 +26,8 @@ import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRule
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereTable;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer;
@@ -59,15 +59,15 @@ public final class SelectTableExecutorTest extends ProxyContextRestorer {
@Before
public void setUp() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(new HashMap<>(), mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new Properties())));
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
@Test
public void assertSelectSchemataExecute() throws SQLException {
- Map<String, ShardingSphereDatabase> databases = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabases();
+ 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);
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/DatabaseBackendHandlerFactoryTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/DatabaseBackendHandlerFactoryTest.java
index c6a0b66127d..652021e0449 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/DatabaseBackendHandlerFactoryTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/DatabaseBackendHandlerFactoryTest.java
@@ -73,8 +73,8 @@ public final class DatabaseBackendHandlerFactoryTest extends ProxyContextRestore
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class);
when(database.isComplete()).thenReturn(true);
when(database.containsDataSource()).thenReturn(true);
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase("db")).thenReturn(database);
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().containsDatabase("db")).thenReturn(true);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase("db")).thenReturn(database);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().containsDatabase("db")).thenReturn(true);
ConnectionSession connectionSession = mock(ConnectionSession.class);
when(connectionSession.getDatabaseName()).thenReturn("db");
when(connectionSession.getBackendConnection()).thenReturn(mock(JDBCBackendConnection.class));
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/impl/UnicastDatabaseBackendHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/impl/UnicastDatabaseBackendHandlerTest.java
index 5382aeced5a..75826f154b4 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/impl/UnicastDatabaseBackendHandlerTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/impl/UnicastDatabaseBackendHandlerTest.java
@@ -26,8 +26,8 @@ import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.communication.BackendConnection;
import org.apache.shardingsphere.proxy.backend.communication.DatabaseCommunicationEngine;
import org.apache.shardingsphere.proxy.backend.communication.DatabaseCommunicationEngineFactory;
@@ -81,9 +81,9 @@ public final class UnicastDatabaseBackendHandlerTest extends ProxyContextRestore
@Before
public void setUp() throws SQLException {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(getDatabases(), mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new Properties())));
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
when(connectionSession.getDefaultDatabaseName()).thenReturn(String.format(DATABASE_PATTERN, 0));
when(connectionSession.getBackendConnection()).thenReturn(mock(BackendConnection.class));
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/CreateDatabaseBackendHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/CreateDatabaseBackendHandlerTest.java
index d3616b5b52b..b7384ae9338 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/CreateDatabaseBackendHandlerTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/CreateDatabaseBackendHandlerTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.proxy.backend.handler.database;
import org.apache.shardingsphere.dialect.exception.syntax.database.DatabaseCreateExistsException;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer;
@@ -51,11 +51,11 @@ public final class CreateDatabaseBackendHandlerTest extends ProxyContextRestorer
@Before
public void setUp() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetadataContexts metadataContexts = mock(MetadataContexts.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ MetaDataContexts metaDataContexts = mock(MetaDataContexts.class, RETURNS_DEEP_STUBS);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
handler = new CreateDatabaseBackendHandler(statement);
- when(metadataContexts.getMetadata().getDatabases()).thenReturn(Collections.singletonMap("test_db", mock(ShardingSphereDatabase.class)));
+ when(metaDataContexts.getMetaData().getDatabases()).thenReturn(Collections.singletonMap("test_db", mock(ShardingSphereDatabase.class)));
}
@Test
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseBackendHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseBackendHandlerTest.java
index 1817c84c3f1..4958135b51f 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseBackendHandlerTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseBackendHandlerTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.proxy.backend.handler.database;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.dialect.exception.syntax.database.DatabaseDropNotExistsException;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
@@ -56,14 +56,14 @@ public final class DropDatabaseBackendHandlerTest extends ProxyContextRestorer {
private DropDatabaseStatement sqlStatement;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private MetadataContexts metadataContexts;
+ private MetaDataContexts metaDataContexts;
private DropDatabaseBackendHandler handler;
@Before
public void setUp() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
handler = new DropDatabaseBackendHandler(sqlStatement, connectionSession);
Map<String, ShardingSphereDatabase> databases = new HashMap<>(2, 1);
@@ -71,12 +71,12 @@ public final class DropDatabaseBackendHandlerTest extends ProxyContextRestorer {
when(database.getRuleMetaData().getRules()).thenReturn(Collections.emptyList());
databases.put("test_db", database);
databases.put("other_db", database);
- when(metadataContexts.getMetadata().getDatabases()).thenReturn(databases);
- when(metadataContexts.getMetadata().getDatabase("test_db")).thenReturn(database);
- when(metadataContexts.getMetadata().getDatabase("other_db")).thenReturn(database);
- when(metadataContexts.getMetadata().getDatabase("test_not_exist_db")).thenReturn(database);
- when(metadataContexts.getMetadata().getDatabase("test_not_exist_db")).thenReturn(database);
- when(metadataContexts.getMetadata().getGlobalRuleMetaData().getRules()).thenReturn(Collections.emptyList());
+ when(metaDataContexts.getMetaData().getDatabases()).thenReturn(databases);
+ when(metaDataContexts.getMetaData().getDatabase("test_db")).thenReturn(database);
+ when(metaDataContexts.getMetaData().getDatabase("other_db")).thenReturn(database);
+ when(metaDataContexts.getMetaData().getDatabase("test_not_exist_db")).thenReturn(database);
+ when(metaDataContexts.getMetaData().getDatabase("test_not_exist_db")).thenReturn(database);
+ when(metaDataContexts.getMetaData().getGlobalRuleMetaData().getRules()).thenReturn(Collections.emptyList());
when(ProxyContext.getInstance().databaseExists("test_db")).thenReturn(true);
when(ProxyContext.getInstance().databaseExists("other_db")).thenReturn(true);
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java
index f5c3132fdb0..db5a03039b3 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.RDLBackendHandlerFactory;
import org.apache.shardingsphere.proxy.backend.handler.distsql.rql.RQLBackendHandlerFactory;
@@ -81,16 +81,16 @@ public final class DistSQLBackendHandlerFactoryTest extends ProxyContextRestorer
private ContextManager mockContextManager() {
ContextManager result = mock(ContextManager.class);
- MetadataContexts metadataContexts = mockMetaDataContexts();
- when(result.getMetadataContexts()).thenReturn(metadataContexts);
+ MetaDataContexts metaDataContexts = mockMetaDataContexts();
+ when(result.getMetaDataContexts()).thenReturn(metaDataContexts);
return result;
}
- private MetadataContexts mockMetaDataContexts() {
- MetadataContexts result = mock(MetadataContexts.class, RETURNS_DEEP_STUBS);
- when(result.getMetadata().containsDatabase("db")).thenReturn(true);
+ private MetaDataContexts mockMetaDataContexts() {
+ MetaDataContexts result = mock(MetaDataContexts.class, RETURNS_DEEP_STUBS);
+ when(result.getMetaData().containsDatabase("db")).thenReturn(true);
ShardingSphereDatabase database = mockDatabase();
- when(result.getMetadata().getDatabase("db")).thenReturn(database);
+ when(result.getMetaData().getDatabase("db")).thenReturn(database);
return result;
}
@@ -207,7 +207,7 @@ public final class DistSQLBackendHandlerFactoryTest extends ProxyContextRestorer
ShadowRuleConfiguration ruleConfig = mockShadowRuleConfiguration();
when(ruleMetaData.getConfigurations()).thenReturn(Collections.singleton(ruleConfig));
when(database.getRuleMetaData()).thenReturn(ruleMetaData);
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase("db")).thenReturn(database);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase("db")).thenReturn(database);
}
private ShadowRuleConfiguration mockShadowRuleConfiguration() {
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/advance/ParseDistSQLHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/advance/ParseDistSQLHandlerTest.java
index 919a2598fed..2fba1b2af9a 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/advance/ParseDistSQLHandlerTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/advance/ParseDistSQLHandlerTest.java
@@ -61,7 +61,7 @@ public final class ParseDistSQLHandlerTest extends ProxyContextRestorer {
@Before
public void setUp() {
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
- when(contextManager.getMetadataContexts().getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
when(globalRuleMetaData.getSingleRule(SQLParserRule.class)).thenReturn(sqlParserRule);
ProxyContext.init(contextManager);
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationHandlerTest.java
index 2080a64a307..a126c1db2ff 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationHandlerTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationHandlerTest.java
@@ -71,11 +71,11 @@ public final class ExportDatabaseConfigurationHandlerTest extends ProxyContextRe
public void init() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
Map<String, ShardingSphereDatabase> databases = createDatabases();
- when(contextManager.getMetadataContexts().getMetadata().getDatabases()).thenReturn(databases);
- when(contextManager.getMetadataContexts().getMetadata().containsDatabase("normal_db")).thenReturn(true);
- when(contextManager.getMetadataContexts().getMetadata().containsDatabase("empty_db")).thenReturn(true);
- when(contextManager.getMetadataContexts().getMetadata().getDatabase("normal_db")).thenReturn(databases.get("normal_db"));
- when(contextManager.getMetadataContexts().getMetadata().getDatabase("empty_db")).thenReturn(databases.get("empty_db"));
+ when(contextManager.getMetaDataContexts().getMetaData().getDatabases()).thenReturn(databases);
+ when(contextManager.getMetaDataContexts().getMetaData().containsDatabase("normal_db")).thenReturn(true);
+ when(contextManager.getMetaDataContexts().getMetaData().containsDatabase("empty_db")).thenReturn(true);
+ when(contextManager.getMetaDataContexts().getMetaData().getDatabase("normal_db")).thenReturn(databases.get("normal_db"));
+ when(contextManager.getMetaDataContexts().getMetaData().getDatabase("empty_db")).thenReturn(databases.get("empty_db"));
ProxyContext.init(contextManager);
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableBackendHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableBackendHandlerTest.java
index 9562180d828..c466904cda0 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableBackendHandlerTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableBackendHandlerTest.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
@@ -54,7 +54,7 @@ public final class ShowDistVariableBackendHandlerTest extends ProxyContextRestor
@Before
public void setup() {
ProxyContext.init(mock(ContextManager.class, RETURNS_DEEP_STUBS));
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().getValue(ConfigurationPropertyKey.PROXY_BACKEND_DRIVER_TYPE)).thenReturn("JDBC");
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().getValue(ConfigurationPropertyKey.PROXY_BACKEND_DRIVER_TYPE)).thenReturn("JDBC");
connectionSession = new ConnectionSession(mock(MySQLDatabaseType.class), TransactionType.LOCAL, new DefaultAttributeMap());
}
@@ -114,11 +114,11 @@ public final class ShowDistVariableBackendHandlerTest extends ProxyContextRestor
connectionSession.setCurrentDatabase("db");
ContextManager contextManager = mock(ContextManager.class);
ProxyContext.init(contextManager);
- MetadataContexts metadataContexts = mock(MetadataContexts.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ MetaDataContexts metaDataContexts = mock(MetaDataContexts.class, RETURNS_DEEP_STUBS);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
Properties props = new Properties();
props.put("sql-show", Boolean.TRUE.toString());
- when(metadataContexts.getMetadata().getProps()).thenReturn(new ConfigurationProperties(props));
+ when(metaDataContexts.getMetaData().getProps()).thenReturn(new ConfigurationProperties(props));
ShowDistVariableHandler backendHandler = new ShowDistVariableHandler();
backendHandler.init(new ShowDistVariableStatement("SQL_SHOW"), connectionSession);
ResponseHeader actual = backendHandler.execute();
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariablesHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariablesHandlerTest.java
index 03822ab0b71..70d394b068b 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariablesHandlerTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariablesHandlerTest.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
@@ -48,16 +48,16 @@ public final class ShowDistVariablesHandlerTest extends ProxyContextRestorer {
@Before
public void setup() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetadataContexts metadataContexts = mockMetaDataContexts();
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ MetaDataContexts metaDataContexts = mockMetaDataContexts();
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
- private MetadataContexts mockMetaDataContexts() {
- MetadataContexts result = mock(MetadataContexts.class, RETURNS_DEEP_STUBS);
+ private MetaDataContexts mockMetaDataContexts() {
+ MetaDataContexts result = mock(MetaDataContexts.class, RETURNS_DEEP_STUBS);
Properties props = new Properties();
props.setProperty(ConfigurationPropertyKey.PROXY_BACKEND_DRIVER_TYPE.getKey(), "JDBC");
- when(result.getMetadata().getProps()).thenReturn(new ConfigurationProperties(props));
+ when(result.getMetaData().getProps()).thenReturn(new ConfigurationProperties(props));
return result;
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetadataHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetadataHandlerTest.java
index 84d147a107c..8aadb4f23f7 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetadataHandlerTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetadataHandlerTest.java
@@ -51,9 +51,9 @@ public final class ShowTableMetadataHandlerTest extends ProxyContextRestorer {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
when(database.getSchema("db_name")).thenReturn(new ShardingSphereSchema(createTableMap(), Collections.emptyMap()));
- when(contextManager.getMetadataContexts().getMetadata().getDatabases()).thenReturn(Collections.singletonMap("db_name", database));
- when(contextManager.getMetadataContexts().getMetadata().containsDatabase("db_name")).thenReturn(true);
- when(contextManager.getMetadataContexts().getMetadata().getDatabase("db_name")).thenReturn(database);
+ when(contextManager.getMetaDataContexts().getMetaData().getDatabases()).thenReturn(Collections.singletonMap("db_name", database));
+ when(contextManager.getMetaDataContexts().getMetaData().containsDatabase("db_name")).thenReturn(true);
+ when(contextManager.getMetaDataContexts().getMetaData().getDatabase("db_name")).thenReturn(database);
ProxyContext.init(contextManager);
ConnectionSession connectionSession = mock(ConnectionSession.class, RETURNS_DEEP_STUBS);
when(connectionSession.getDatabaseName()).thenReturn("db_name");
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationHandlerTest.java
index d0be2c5e7df..2abb54e352f 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationHandlerTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationHandlerTest.java
@@ -101,7 +101,7 @@ public final class ImportDatabaseConfigurationHandlerTest extends ProxyContextRe
shardingRuleConfigurationImportCheckerField.setAccessible(true);
shardingRuleConfigurationImportCheckerField.set(importDatabaseConfigurationHandler, shardingRuleConfigurationImportChecker);
assertNotNull(ProxyContext.getInstance().getContextManager().getDataSourceMap(sharding));
- assertNotNull(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase(sharding).getRuleMetaData().getConfigurations());
+ assertNotNull(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase(sharding).getRuleMetaData().getConfigurations());
assertThat(importDatabaseConfigurationHandler.execute(), instanceOf(UpdateResponseHeader.class));
}
@@ -112,7 +112,7 @@ public final class ImportDatabaseConfigurationHandlerTest extends ProxyContextRe
readwriteSplittingRuleConfigurationImportCheckerField.setAccessible(true);
readwriteSplittingRuleConfigurationImportCheckerField.set(importDatabaseConfigurationHandler, readwriteSplittingRuleConfigurationImportChecker);
assertNotNull(ProxyContext.getInstance().getContextManager().getDataSourceMap(readwriteSplitting));
- assertNotNull(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase(readwriteSplitting).getRuleMetaData().getConfigurations());
+ assertNotNull(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase(readwriteSplitting).getRuleMetaData().getConfigurations());
assertThat(importDatabaseConfigurationHandler.execute(), instanceOf(UpdateResponseHeader.class));
}
@@ -123,7 +123,7 @@ public final class ImportDatabaseConfigurationHandlerTest extends ProxyContextRe
databaseDiscoveryRuleConfigurationImportCheckerField.setAccessible(true);
databaseDiscoveryRuleConfigurationImportCheckerField.set(importDatabaseConfigurationHandler, databaseDiscoveryRuleConfigurationImportChecker);
assertNotNull(ProxyContext.getInstance().getContextManager().getDataSourceMap(databaseDiscovery));
- assertNotNull(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase(databaseDiscovery).getRuleMetaData().getConfigurations());
+ assertNotNull(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase(databaseDiscovery).getRuleMetaData().getConfigurations());
assertThat(importDatabaseConfigurationHandler.execute(), instanceOf(UpdateResponseHeader.class));
}
@@ -138,9 +138,9 @@ public final class ImportDatabaseConfigurationHandlerTest extends ProxyContextRe
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
when(database.getSchema(DefaultDatabase.LOGIC_NAME)).thenReturn(new ShardingSphereSchema(createTableMap(), Collections.emptyMap()));
when(database.getResourceMetaData().getDataSources()).thenReturn(createDataSourceMap());
- when(contextManager.getMetadataContexts().getMetadata().getDatabases()).thenReturn(Collections.singletonMap(feature, database));
- when(contextManager.getMetadataContexts().getMetadata().getDatabase(feature)).thenReturn(database);
- when(contextManager.getMetadataContexts().getMetadata().containsDatabase(feature)).thenReturn(true);
+ when(contextManager.getMetaDataContexts().getMetaData().getDatabases()).thenReturn(Collections.singletonMap(feature, database));
+ when(contextManager.getMetaDataContexts().getMetaData().getDatabase(feature)).thenReturn(database);
+ when(contextManager.getMetaDataContexts().getMetaData().containsDatabase(feature)).thenReturn(true);
ProxyContext.init(contextManager);
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetadataHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetadataHandlerTest.java
index c168f715453..f0dd890b1cc 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetadataHandlerTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetadataHandlerTest.java
@@ -60,7 +60,7 @@ public final class RefreshTableMetadataHandlerTest extends ProxyContextRestorer
public void setup() {
ProxyContext.init(contextManager);
ConfigurationProperties configurationProps = new ConfigurationProperties(createProperties());
- when(contextManager.getMetadataContexts().getMetadata()).thenReturn(shardingSphereMetaData);
+ when(contextManager.getMetaDataContexts().getMetaData()).thenReturn(shardingSphereMetaData);
when(shardingSphereMetaData.getProps()).thenReturn(configurationProps);
connectionSession = mock(ConnectionSession.class, RETURNS_DEEP_STUBS);
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableBackendHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableBackendHandlerTest.java
index d13b6119199..063f27baa6c 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableBackendHandlerTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableBackendHandlerTest.java
@@ -29,8 +29,8 @@ import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphere
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereSchema;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.exception.UnsupportedVariableException;
import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.common.enums.VariableEnum;
@@ -64,10 +64,10 @@ public final class SetDistVariableBackendHandlerTest extends ProxyContextRestore
@Before
public void setUp() {
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(createDatabases(), mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(createProperties())));
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
connectionSession = new ConnectionSession(mock(MySQLDatabaseType.class), TransactionType.LOCAL, new DefaultAttributeMap());
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableExecutorTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableExecutorTest.java
index dfa6ba791cd..ef3586f7f74 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableExecutorTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableExecutorTest.java
@@ -21,8 +21,8 @@ import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.SetDistV
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.common.enums.VariableEnum;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
@@ -70,14 +70,14 @@ public final class SetDistVariableExecutorTest extends ProxyContextRestorer {
@Test
public void assertExecuteWithConfigurationKey() throws SQLException {
- ContextManager contextManager = new ContextManager(new MetadataContexts(mock(MetadataPersistService.class), new ShardingSphereMetaData()), null);
+ ContextManager contextManager = new ContextManager(new MetaDataContexts(mock(MetaDataPersistService.class), new ShardingSphereMetaData()), null);
ProxyContext.init(contextManager);
SetDistVariableStatement statement = new SetDistVariableStatement("proxy_frontend_flush_threshold", "1024");
SetDistVariableHandler handler = new SetDistVariableHandler();
handler.init(statement, connectionSession);
handler.execute();
- Object actualValue = contextManager.getMetadataContexts().getMetadata().getProps().getProps().get("proxy-frontend-flush-threshold");
+ Object actualValue = contextManager.getMetaDataContexts().getMetaData().getProps().getProps().get("proxy-frontend-flush-threshold");
assertThat(actualValue.toString(), is("1024"));
- assertThat(contextManager.getMetadataContexts().getMetadata().getProps().getValue(ConfigurationPropertyKey.PROXY_FRONTEND_FLUSH_THRESHOLD), is(1024));
+ assertThat(contextManager.getMetaDataContexts().getMetaData().getProps().getValue(ConfigurationPropertyKey.PROXY_FRONTEND_FLUSH_THRESHOLD), is(1024));
}
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/AlterStorageUnitBackendHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/AlterStorageUnitBackendHandlerTest.java
index bf03d1e57fb..a4b962c9bcc 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/AlterStorageUnitBackendHandlerTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/AlterStorageUnitBackendHandlerTest.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.infra.distsql.exception.resource.MissingRequire
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
@@ -69,7 +69,7 @@ public final class AlterStorageUnitBackendHandlerTest extends ProxyContextRestor
private ConnectionSession connectionSession;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private MetadataContexts metadataContexts;
+ private MetaDataContexts metaDataContexts;
@Mock
private ShardingSphereDatabase database;
@@ -84,8 +84,8 @@ public final class AlterStorageUnitBackendHandlerTest extends ProxyContextRestor
@Before
public void setUp() throws Exception {
- when(metadataContexts.getMetadata().getDatabase("test_db")).thenReturn(database);
- when(metadataContexts.getMetadata().containsDatabase("test_db")).thenReturn(true);
+ when(metaDataContexts.getMetaData().getDatabase("test_db")).thenReturn(database);
+ when(metaDataContexts.getMetaData().containsDatabase("test_db")).thenReturn(true);
when(connectionSession.getProtocolType()).thenReturn(new MySQLDatabaseType());
alterStorageUnitBackendHandler = new AlterStorageUnitBackendHandler(alterStorageUnitStatement, connectionSession);
Field field = alterStorageUnitBackendHandler.getClass().getDeclaredField("validator");
@@ -96,7 +96,7 @@ public final class AlterStorageUnitBackendHandlerTest extends ProxyContextRestor
@Test
public void assertExecute() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
when(database.getResourceMetaData()).thenReturn(resourceMetaData);
when(resourceMetaData.getDataSources()).thenReturn(Collections.singletonMap("ds_0", mockHikariDataSource("ds_0")));
@@ -111,9 +111,9 @@ public final class AlterStorageUnitBackendHandlerTest extends ProxyContextRestor
@Test(expected = MissingRequiredResourcesException.class)
public void assertExecuteWithNotExistedStorageUnitNames() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
- when(metadataContexts.getMetadata().getDatabases()).thenReturn(Collections.singletonMap("test_db", database));
+ when(metaDataContexts.getMetaData().getDatabases()).thenReturn(Collections.singletonMap("test_db", database));
when(database.getResourceMetaData()).thenReturn(resourceMetaData);
when(resourceMetaData.getDataSources()).thenReturn(Collections.singletonMap("ds_0", dataSource));
alterStorageUnitBackendHandler.execute("test_db", createAlterStorageUnitStatement("not_existed"));
@@ -122,7 +122,7 @@ public final class AlterStorageUnitBackendHandlerTest extends ProxyContextRestor
@Test(expected = InvalidResourcesException.class)
public void assertExecuteWithAlterDatabase() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
when(database.getResourceMetaData()).thenReturn(resourceMetaData);
when(resourceMetaData.getDataSources()).thenReturn(Collections.singletonMap("ds_0", mockHikariDataSource("ds_1")));
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/RegisterStorageUnitBackendHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/RegisterStorageUnitBackendHandlerTest.java
index d8c7711e31e..5000e20635b 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/RegisterStorageUnitBackendHandlerTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/RegisterStorageUnitBackendHandlerTest.java
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
@@ -71,7 +71,7 @@ public final class RegisterStorageUnitBackendHandlerTest extends ProxyContextRes
private ConnectionSession connectionSession;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private MetadataContexts metadataContexts;
+ private MetaDataContexts metaDataContexts;
@Mock
private ShardingSphereDatabase database;
@@ -89,8 +89,8 @@ public final class RegisterStorageUnitBackendHandlerTest extends ProxyContextRes
@Before
public void setUp() throws Exception {
- when(metadataContexts.getMetadata().getDatabase("test_db")).thenReturn(database);
- when(metadataContexts.getMetadata().containsDatabase("test_db")).thenReturn(true);
+ when(metaDataContexts.getMetaData().getDatabase("test_db")).thenReturn(database);
+ when(metaDataContexts.getMetaData().containsDatabase("test_db")).thenReturn(true);
when(connectionSession.getProtocolType()).thenReturn(new MySQLDatabaseType());
when(database.getRuleMetaData()).thenReturn(ruleMetaData);
when(ruleMetaData.findSingleRule(ReadwriteSplittingRule.class)).thenReturn(Optional.of(readwriteSplittingRule));
@@ -103,9 +103,9 @@ public final class RegisterStorageUnitBackendHandlerTest extends ProxyContextRes
@Test
public void assertExecute() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
- when(metadataContexts.getMetadata().getDatabases()).thenReturn(Collections.singletonMap("test_db", database));
+ when(metaDataContexts.getMetaData().getDatabases()).thenReturn(Collections.singletonMap("test_db", database));
when(database.getResourceMetaData()).thenReturn(resourceMetaData);
when(resourceMetaData.getDataSources()).thenReturn(Collections.emptyMap());
when(readwriteSplittingRule.getConfiguration()).thenReturn(createReadwriteSplittingRuleConfiguration("read_write"));
@@ -116,9 +116,9 @@ public final class RegisterStorageUnitBackendHandlerTest extends ProxyContextRes
@Test(expected = DuplicateResourceException.class)
public void assertExecuteWithDuplicateStorageUnitNamesInStatement() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
- when(metadataContexts.getMetadata().getDatabases()).thenReturn(Collections.singletonMap("test_db", database));
+ when(metaDataContexts.getMetaData().getDatabases()).thenReturn(Collections.singletonMap("test_db", database));
when(database.getResourceMetaData()).thenReturn(resourceMetaData);
when(resourceMetaData.getDataSources()).thenReturn(Collections.emptyMap());
registerStorageUnitBackendHandler.execute("test_db", createRegisterStorageUnitStatementWithDuplicateStorageUnitNames());
@@ -127,9 +127,9 @@ public final class RegisterStorageUnitBackendHandlerTest extends ProxyContextRes
@Test(expected = DuplicateResourceException.class)
public void assertExecuteWithDuplicateStorageUnitNamesWithResourceMetaData() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
- when(metadataContexts.getMetadata().getDatabases()).thenReturn(Collections.singletonMap("test_db", database));
+ when(metaDataContexts.getMetaData().getDatabases()).thenReturn(Collections.singletonMap("test_db", database));
when(database.getResourceMetaData()).thenReturn(resourceMetaData);
when(resourceMetaData.getDataSources()).thenReturn(Collections.singletonMap("ds_0", null));
registerStorageUnitBackendHandler.execute("test_db", createRegisterStorageUnitStatement());
@@ -138,9 +138,9 @@ public final class RegisterStorageUnitBackendHandlerTest extends ProxyContextRes
@Test(expected = InvalidResourcesException.class)
public void assertExecuteWithDuplicateStorageUnitNamesWithReadwriteSplittingRule() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
- when(metadataContexts.getMetadata().getDatabases()).thenReturn(Collections.singletonMap("test_db", database));
+ when(metaDataContexts.getMetaData().getDatabases()).thenReturn(Collections.singletonMap("test_db", database));
when(database.getResourceMetaData()).thenReturn(resourceMetaData);
when(resourceMetaData.getDataSources()).thenReturn(Collections.emptyMap());
when(readwriteSplittingRule.getConfiguration()).thenReturn(createReadwriteSplittingRuleConfiguration("ds_0"));
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/UnregisterStorageUnitBackendHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/UnregisterStorageUnitBackendHandlerTest.java
index c462c092ba7..c2d68553670 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/UnregisterStorageUnitBackendHandlerTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/UnregisterStorageUnitBackendHandlerTest.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
@@ -87,11 +87,11 @@ public final class UnregisterStorageUnitBackendHandlerTest extends ProxyContextR
when(resourceMetaData.getDataSources()).thenReturn(Collections.singletonMap("foo_ds", dataSource));
when(database.getRuleMetaData()).thenReturn(ruleMetaData);
when(database.getResourceMetaData()).thenReturn(resourceMetaData);
- MetadataContexts metadataContexts = mock(MetadataContexts.class, RETURNS_DEEP_STUBS);
- when(metadataContexts.getMetadata().getDatabases()).thenReturn(Collections.singletonMap("test", database));
- when(metadataContexts.getMetadata().containsDatabase("test")).thenReturn(true);
+ MetaDataContexts metaDataContexts = mock(MetaDataContexts.class, RETURNS_DEEP_STUBS);
+ when(metaDataContexts.getMetaData().getDatabases()).thenReturn(Collections.singletonMap("test", database));
+ when(metaDataContexts.getMetaData().containsDatabase("test")).thenReturn(true);
contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
unregisterStorageUnitBackendHandler = new UnregisterStorageUnitBackendHandler(unregisterStorageUnitStatement, connectionSession);
}
@@ -101,7 +101,7 @@ public final class UnregisterStorageUnitBackendHandlerTest extends ProxyContextR
when(ruleMetaData.getRules()).thenReturn(Collections.emptyList());
when(resourceMetaData.getDataSources()).thenReturn(Collections.singletonMap("foo_ds", dataSource));
when(database.getResourceMetaData()).thenReturn(resourceMetaData);
- when(contextManager.getMetadataContexts().getMetadata().getDatabase("test")).thenReturn(database);
+ when(contextManager.getMetaDataContexts().getMetaData().getDatabase("test")).thenReturn(database);
UnregisterStorageUnitStatement unregisterStorageUnitStatement = new UnregisterStorageUnitStatement(Collections.singleton("foo_ds"), false);
assertThat(unregisterStorageUnitBackendHandler.execute("test", unregisterStorageUnitStatement), instanceOf(UpdateResponseHeader.class));
verify(contextManager).dropResources("test", unregisterStorageUnitStatement.getStorageUnitNames());
@@ -119,7 +119,7 @@ public final class UnregisterStorageUnitBackendHandlerTest extends ProxyContextR
when(shadowRule.getDataSourceMapper()).thenReturn(Collections.singletonMap("", Collections.singleton("foo_ds")));
when(resourceMetaData.getDataSources()).thenReturn(Collections.singletonMap("foo_ds", dataSource));
when(database.getResourceMetaData()).thenReturn(resourceMetaData);
- when(contextManager.getMetadataContexts().getMetadata().getDatabase("test")).thenReturn(database);
+ when(contextManager.getMetaDataContexts().getMetaData().getDatabase("test")).thenReturn(database);
unregisterStorageUnitBackendHandler.execute("test", new UnregisterStorageUnitStatement(Collections.singleton("foo_ds"), false));
}
@@ -132,7 +132,7 @@ public final class UnregisterStorageUnitBackendHandlerTest extends ProxyContextR
when(singleTableRule.getAllDataNodes()).thenReturn(Collections.singletonMap("", Collections.singleton(dataNode)));
when(resourceMetaData.getDataSources()).thenReturn(Collections.singletonMap("foo_ds", dataSource));
when(database.getResourceMetaData()).thenReturn(resourceMetaData);
- when(contextManager.getMetadataContexts().getMetadata().getDatabase("test")).thenReturn(database);
+ when(contextManager.getMetaDataContexts().getMetaData().getDatabase("test")).thenReturn(database);
unregisterStorageUnitBackendHandler.execute("test", new UnregisterStorageUnitStatement(Collections.singleton("foo_ds"), false));
}
@@ -145,7 +145,7 @@ public final class UnregisterStorageUnitBackendHandlerTest extends ProxyContextR
when(singleTableRule.getAllDataNodes()).thenReturn(Collections.singletonMap("", Collections.singleton(dataNode)));
when(resourceMetaData.getDataSources()).thenReturn(Collections.singletonMap("foo_ds", dataSource));
when(database.getResourceMetaData()).thenReturn(resourceMetaData);
- when(contextManager.getMetadataContexts().getMetadata().getDatabase("test")).thenReturn(database);
+ when(contextManager.getMetaDataContexts().getMetaData().getDatabase("test")).thenReturn(database);
UnregisterStorageUnitStatement unregisterStorageUnitStatement = new UnregisterStorageUnitStatement(Collections.singleton("foo_ds"), true);
assertThat(unregisterStorageUnitBackendHandler.execute("test", unregisterStorageUnitStatement), instanceOf(UpdateResponseHeader.class));
verify(contextManager).dropResources("test", unregisterStorageUnitStatement.getStorageUnitNames());
@@ -163,7 +163,7 @@ public final class UnregisterStorageUnitBackendHandlerTest extends ProxyContextR
when(ruleMetaData.getRules()).thenReturn(Collections.singleton(shadowRule));
when(shadowRule.getType()).thenReturn("ShadowRule");
when(shadowRule.getDataSourceMapper()).thenReturn(Collections.singletonMap("", Collections.singleton("foo_ds")));
- when(contextManager.getMetadataContexts().getMetadata().getDatabase("test")).thenReturn(database);
+ when(contextManager.getMetaDataContexts().getMetaData().getDatabase("test")).thenReturn(database);
UnregisterStorageUnitStatement unregisterStorageUnitStatement = new UnregisterStorageUnitStatement(true, Collections.singleton("foo_ds"), true);
unregisterStorageUnitBackendHandler.execute("test", unregisterStorageUnitStatement);
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RQLBackendHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RQLBackendHandlerTest.java
index 25632ccf867..6813935b5d4 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RQLBackendHandlerTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RQLBackendHandlerTest.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.distsql.query.DatabaseDistSQLResultSet;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.query.QueryHeader;
@@ -49,14 +49,14 @@ public final class RQLBackendHandlerTest extends ProxyContextRestorer {
@Before
public void setUp() {
- MetadataContexts metadataContexts = mock(MetadataContexts.class, RETURNS_DEEP_STUBS);
+ MetaDataContexts metaDataContexts = mock(MetaDataContexts.class, RETURNS_DEEP_STUBS);
ShardingSphereRuleMetaData ruleMetaData = mock(ShardingSphereRuleMetaData.class);
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class);
when(database.getRuleMetaData()).thenReturn(ruleMetaData);
- when(metadataContexts.getMetadata().getDatabases()).thenReturn(Collections.singletonMap("test", database));
- when(metadataContexts.getMetadata().containsDatabase("test")).thenReturn(true);
+ when(metaDataContexts.getMetaData().getDatabases()).thenReturn(Collections.singletonMap("test", database));
+ when(metaDataContexts.getMetaData().containsDatabase("test")).thenReturn(true);
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RuleDefinitionBackendHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RuleDefinitionBackendHandlerTest.java
index 6ef349743f1..423213d4de9 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RuleDefinitionBackendHandlerTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RuleDefinitionBackendHandlerTest.java
@@ -56,8 +56,8 @@ public final class RuleDefinitionBackendHandlerTest extends ProxyContextRestorer
ShardingSphereRuleMetaData ruleMetaData = mock(ShardingSphereRuleMetaData.class, RETURNS_DEEP_STUBS);
when(ruleMetaData.getConfigurations()).thenReturn(Collections.emptyList());
when(database.getRuleMetaData()).thenReturn(ruleMetaData);
- when(result.getMetadataContexts().getMetadata().containsDatabase("test")).thenReturn(true);
- when(result.getMetadataContexts().getMetadata().getDatabase("test")).thenReturn(database);
+ when(result.getMetaDataContexts().getMetaData().containsDatabase("test")).thenReturn(true);
+ when(result.getMetaDataContexts().getMetaData().getDatabase("test")).thenReturn(database);
return result;
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandlerFactoryTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandlerFactoryTest.java
index 770ae30555b..e583935822c 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandlerFactoryTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandlerFactoryTest.java
@@ -61,7 +61,7 @@ public final class TransactionBackendHandlerFactoryTest extends ProxyContextRest
public void setTransactionContexts() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
- when(contextManager.getMetadataContexts().getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
when(globalRuleMetaData.getSingleRule(TransactionRule.class)).thenReturn(mock(TransactionRule.class));
ProxyContext.init(contextManager);
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandlerTest.java
index e1df8150dda..fb648dce2f1 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandlerTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandlerTest.java
@@ -46,7 +46,7 @@ public final class TransactionBackendHandlerTest extends ProxyContextRestorer {
public void setTransactionContexts() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
- when(contextManager.getMetadataContexts().getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
when(globalRuleMetaData.getSingleRule(TransactionRule.class)).thenReturn(mock(TransactionRule.class));
ProxyContext.init(contextManager);
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/session/ConnectionSessionTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/session/ConnectionSessionTest.java
index ac9cc609c00..4e5648414f6 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/session/ConnectionSessionTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/session/ConnectionSessionTest.java
@@ -58,7 +58,7 @@ public final class ConnectionSessionTest extends ProxyContextRestorer {
@Before
public void setup() {
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
- when(contextManager.getMetadataContexts().getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
when(globalRuleMetaData.getSingleRule(TransactionRule.class)).thenReturn(mock(TransactionRule.class));
ProxyContext.init(contextManager);
connectionSession = new ConnectionSession(mock(MySQLDatabaseType.class), TransactionType.LOCAL, null);
diff --git a/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/version/ShardingSphereProxyVersion.java b/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/version/ShardingSphereProxyVersion.java
index 77a8bb6157a..3f669543715 100644
--- a/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/version/ShardingSphereProxyVersion.java
+++ b/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/version/ShardingSphereProxyVersion.java
@@ -47,7 +47,7 @@ public final class ShardingSphereProxyVersion {
*/
public static void setVersion(final ContextManager contextManager) {
CommonConstants.PROXY_VERSION.set(ShardingSphereProxyVersion.getProxyVersion());
- contextManager.getMetadataContexts().getMetadata().getDatabases().values().forEach(ShardingSphereProxyVersion::setDatabaseVersion);
+ contextManager.getMetaDataContexts().getMetaData().getDatabases().values().forEach(ShardingSphereProxyVersion::setDatabaseVersion);
}
private static String getProxyVersion() {
diff --git a/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/version/ShardingSphereProxyVersionTest.java b/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/version/ShardingSphereProxyVersionTest.java
index 2b21e3aed9f..9669981841c 100644
--- a/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/version/ShardingSphereProxyVersionTest.java
+++ b/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/version/ShardingSphereProxyVersionTest.java
@@ -54,11 +54,11 @@ public final class ShardingSphereProxyVersionTest {
when(resourceMetaData.getDataSources()).thenReturn(Collections.singletonMap("ds_0", dataSource));
when(database.getResourceMetaData()).thenReturn(resourceMetaData);
when(database.getProtocolType()).thenReturn(DatabaseTypeFactory.getInstance("MySQL"));
- when(contextManager.getMetadataContexts().getMetadata().getDatabases()).thenReturn(Collections.singletonMap("sharding_db", database));
+ when(contextManager.getMetaDataContexts().getMetaData().getDatabases()).thenReturn(Collections.singletonMap("sharding_db", database));
try (MockedStatic<ProxyContext> mockedStatic = mockStatic(ProxyContext.class)) {
ProxyContext proxyContext = mock(ProxyContext.class, RETURNS_DEEP_STUBS);
mockedStatic.when(ProxyContext::getInstance).thenReturn(proxyContext);
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().getValue(ConfigurationPropertyKey.PROXY_MYSQL_DEFAULT_VERSION)).thenReturn("5.7.22");
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().getValue(ConfigurationPropertyKey.PROXY_MYSQL_DEFAULT_VERSION)).thenReturn("5.7.22");
ShardingSphereProxyVersion.setVersion(contextManager);
}
assertThat(MySQLServerInfo.getServerVersion("sharding_db"), startsWith("5.7.32"));
@@ -75,7 +75,7 @@ public final class ShardingSphereProxyVersionTest {
when(resourceMetaData.getDataSources()).thenReturn(Collections.singletonMap("ds_0", dataSource));
when(database.getResourceMetaData()).thenReturn(resourceMetaData);
when(database.getProtocolType()).thenReturn(DatabaseTypeFactory.getInstance("MySQL"));
- when(contextManager.getMetadataContexts().getMetadata().getDatabases()).thenReturn(Collections.singletonMap("sharding_db", database));
+ when(contextManager.getMetaDataContexts().getMetaData().getDatabases()).thenReturn(Collections.singletonMap("sharding_db", database));
ShardingSphereProxyVersion.setVersion(contextManager);
assertThat(MySQLServerInfo.getServerVersion("sharding_db"), startsWith("5.7.22"));
}
diff --git a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/ShardingSphereProxy.java b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/ShardingSphereProxy.java
index 35e7b23ac10..62ff0b88a88 100644
--- a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/ShardingSphereProxy.java
+++ b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/ShardingSphereProxy.java
@@ -95,17 +95,17 @@ public final class ShardingSphereProxy {
}
private EventLoopGroup getWorkerGroup() {
- String driverType = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().getValue(ConfigurationPropertyKey.PROXY_BACKEND_DRIVER_TYPE);
+ String driverType = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().getValue(ConfigurationPropertyKey.PROXY_BACKEND_DRIVER_TYPE);
boolean reactiveBackendEnabled = "ExperimentalVertx".equalsIgnoreCase(driverType);
if (reactiveBackendEnabled) {
return VertxBackendDataSource.getInstance().getVertx().nettyEventLoopGroup();
}
- int workerThreads = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_FRONTEND_EXECUTOR_SIZE);
+ int workerThreads = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_FRONTEND_EXECUTOR_SIZE);
return Epoll.isAvailable() ? new EpollEventLoopGroup(workerThreads) : new NioEventLoopGroup(workerThreads);
}
private void initServerBootstrap(final ServerBootstrap bootstrap) {
- Integer backLog = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_NETTY_BACKLOG);
+ Integer backLog = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_NETTY_BACKLOG);
bootstrap.group(bossGroup, workerGroup)
.channel(Epoll.isAvailable() ? EpollServerSocketChannel.class : NioServerSocketChannel.class)
.option(ChannelOption.WRITE_BUFFER_WATER_MARK, new WriteBufferWaterMark(8 * 1024 * 1024, 16 * 1024 * 1024))
diff --git a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTask.java b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTask.java
index 5b799a32baa..217593b3340 100644
--- a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTask.java
+++ b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTask.java
@@ -69,7 +69,7 @@ public final class CommandExecutorTask implements Runnable {
@Override
public void run() {
boolean isNeedFlush = false;
- boolean sqlShowEnabled = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().getValue(ConfigurationPropertyKey.SQL_SHOW);
+ boolean sqlShowEnabled = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().getValue(ConfigurationPropertyKey.SQL_SHOW);
try (PacketPayload payload = databaseProtocolFrontendEngine.getCodecEngine().createPacketPayload((ByteBuf) message, context.channel().attr(CommonConstants.CHARSET_ATTRIBUTE_KEY).get())) {
if (sqlShowEnabled) {
fillLogMDC();
diff --git a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/connection/ConnectionLimitContext.java b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/connection/ConnectionLimitContext.java
index 2318d16e808..956b04a3bc9 100644
--- a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/connection/ConnectionLimitContext.java
+++ b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/connection/ConnectionLimitContext.java
@@ -74,6 +74,6 @@ public final class ConnectionLimitContext {
* @return limit size.
*/
public int getMaxConnections() {
- return ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_FRONTEND_MAX_CONNECTIONS);
+ return ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_FRONTEND_MAX_CONNECTIONS);
}
}
diff --git a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/netty/CDCChannelInboundHandler.java b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/netty/CDCChannelInboundHandler.java
index 14b78a5054b..c52ff9a1f2a 100644
--- a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/netty/CDCChannelInboundHandler.java
+++ b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/netty/CDCChannelInboundHandler.java
@@ -98,7 +98,7 @@ public final class CDCChannelInboundHandler extends ChannelInboundHandlerAdapter
return;
}
BasicBody body = request.getLogin().getBasicBody();
- Collection<ShardingSphereRule> globalRules = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData().getRules();
+ Collection<ShardingSphereRule> globalRules = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules();
Optional<AuthorityRule> authorityRule = globalRules.stream().filter(rule -> rule instanceof AuthorityRule).map(rule -> (AuthorityRule) rule).findFirst();
if (!authorityRule.isPresent()) {
ctx.writeAndFlush(CDCResponseGenerator.failed(request.getRequestId(), CDCResponseErrorCode.SERVER_ERROR, "Not find authority rule")).addListener(ChannelFutureListener.CLOSE);
diff --git a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/netty/FrontendChannelInboundHandler.java b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/netty/FrontendChannelInboundHandler.java
index 3e530507005..a38a5ea0e4a 100644
--- a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/netty/FrontendChannelInboundHandler.java
+++ b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/netty/FrontendChannelInboundHandler.java
@@ -54,7 +54,7 @@ public final class FrontendChannelInboundHandler extends ChannelInboundHandlerAd
public FrontendChannelInboundHandler(final DatabaseProtocolFrontendEngine databaseProtocolFrontendEngine, final Channel channel) {
this.databaseProtocolFrontendEngine = databaseProtocolFrontendEngine;
connectionSession = new ConnectionSession(DatabaseTypeFactory.getInstance(databaseProtocolFrontendEngine.getType()),
- ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData().getSingleRule(TransactionRule.class).getDefaultType(), channel);
+ ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(TransactionRule.class).getDefaultType(), channel);
}
@Override
diff --git a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactory.java b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactory.java
index fe34bbcf9a6..08f555a9ba1 100644
--- a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactory.java
+++ b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactory.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeEngine;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import java.util.Optional;
@@ -46,18 +46,18 @@ public final class FrontDatabaseProtocolTypeFactory {
if (configuredDatabaseType.isPresent()) {
return configuredDatabaseType.get();
}
- MetadataContexts metadataContexts = ProxyContext.getInstance().getContextManager().getMetadataContexts();
- if (metadataContexts.getMetadata().getDatabases().isEmpty()) {
+ MetaDataContexts metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
+ if (metaDataContexts.getMetaData().getDatabases().isEmpty()) {
return DatabaseTypeEngine.getTrunkDatabaseType(DEFAULT_FRONTEND_DATABASE_PROTOCOL_TYPE);
}
- Optional<ShardingSphereDatabase> database = metadataContexts.getMetadata().getDatabases().values().stream().filter(ShardingSphereDatabase::containsDataSource).findFirst();
+ Optional<ShardingSphereDatabase> database = metaDataContexts.getMetaData().getDatabases().values().stream().filter(ShardingSphereDatabase::containsDataSource).findFirst();
return database.isPresent() ? database.get().getResourceMetaData().getStorageTypes().values().iterator().next()
: DatabaseTypeEngine.getTrunkDatabaseType(DEFAULT_FRONTEND_DATABASE_PROTOCOL_TYPE);
}
private static Optional<DatabaseType> findConfiguredDatabaseType() {
String configuredDatabaseType = ProxyContext.getInstance()
- .getContextManager().getMetadataContexts().getMetadata().getProps().getValue(ConfigurationPropertyKey.PROXY_FRONTEND_DATABASE_PROTOCOL_TYPE);
+ .getContextManager().getMetaDataContexts().getMetaData().getProps().getValue(ConfigurationPropertyKey.PROXY_FRONTEND_DATABASE_PROTOCOL_TYPE);
return configuredDatabaseType.isEmpty() ? Optional.empty() : Optional.of(DatabaseTypeEngine.getTrunkDatabaseType(configuredDatabaseType));
}
}
diff --git a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/state/ProxyStateContext.java b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/state/ProxyStateContext.java
index c5a3bb4cd88..0b1d32f93a7 100644
--- a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/state/ProxyStateContext.java
+++ b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/state/ProxyStateContext.java
@@ -48,7 +48,7 @@ public final class ProxyStateContext {
}
private static OKProxyState determineOKProxyState() {
- String backendDriverType = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().getValue(ConfigurationPropertyKey.PROXY_BACKEND_DRIVER_TYPE);
+ String backendDriverType = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().getValue(ConfigurationPropertyKey.PROXY_BACKEND_DRIVER_TYPE);
return OKProxyStateFactory.getInstance(backendDriverType);
}
diff --git a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/state/impl/JDBCOKProxyState.java b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/state/impl/JDBCOKProxyState.java
index 715ce38df91..4bc525845f0 100644
--- a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/state/impl/JDBCOKProxyState.java
+++ b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/state/impl/JDBCOKProxyState.java
@@ -57,13 +57,13 @@ public final class JDBCOKProxyState implements OKProxyState {
}
private boolean requireOccupyThreadForConnection(final ConnectionSession connectionSession) {
- return ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().<Boolean>getValue(ConfigurationPropertyKey.PROXY_HINT_ENABLED)
+ return ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().<Boolean>getValue(ConfigurationPropertyKey.PROXY_HINT_ENABLED)
|| TransactionType.isDistributedTransaction(connectionSession.getTransactionStatus().getTransactionType());
}
private boolean isPreferNettyEventLoop() {
return BackendExecutorType.OLTP == ProxyContext.getInstance()
- .getContextManager().getMetadataContexts().getMetadata().getProps().<BackendExecutorType>getValue(ConfigurationPropertyKey.PROXY_BACKEND_EXECUTOR_SUITABLE);
+ .getContextManager().getMetaDataContexts().getMetaData().getProps().<BackendExecutorType>getValue(ConfigurationPropertyKey.PROXY_BACKEND_EXECUTOR_SUITABLE);
}
@Override
diff --git a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTaskTest.java b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTaskTest.java
index 2bca5206640..db63ccce12b 100644
--- a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTaskTest.java
+++ b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTaskTest.java
@@ -27,8 +27,8 @@ import org.apache.shardingsphere.db.protocol.payload.PacketPayload;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.JDBCBackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.exception.BackendConnectionException;
@@ -99,7 +99,7 @@ public final class CommandExecutorTaskTest extends ProxyContextRestorer {
@Before
public void setup() {
- ProxyContext.init(new ContextManager(new MetadataContexts(mock(MetadataPersistService.class), new ShardingSphereMetaData()), mock(InstanceContext.class)));
+ ProxyContext.init(new ContextManager(new MetaDataContexts(mock(MetaDataPersistService.class), new ShardingSphereMetaData()), mock(InstanceContext.class)));
when(connectionSession.getBackendConnection()).thenReturn(backendConnection);
when(handlerContext.channel().attr(CommonConstants.CHARSET_ATTRIBUTE_KEY).get()).thenReturn(StandardCharsets.UTF_8);
}
diff --git a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/connection/ConnectionLimitContextTest.java b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/connection/ConnectionLimitContextTest.java
index a157625208c..8375e04da3a 100644
--- a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/connection/ConnectionLimitContextTest.java
+++ b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/connection/ConnectionLimitContextTest.java
@@ -39,7 +39,7 @@ public final class ConnectionLimitContextTest extends ProxyContextRestorer {
@Test
public void assertConnectionsLimited() {
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().getValue(ConfigurationPropertyKey.PROXY_FRONTEND_MAX_CONNECTIONS)).thenReturn(2);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().getValue(ConfigurationPropertyKey.PROXY_FRONTEND_MAX_CONNECTIONS)).thenReturn(2);
assertTrue(ConnectionLimitContext.getInstance().connectionAllowed());
assertTrue(ConnectionLimitContext.getInstance().connectionAllowed());
assertFalse(ConnectionLimitContext.getInstance().connectionAllowed());
@@ -53,7 +53,7 @@ public final class ConnectionLimitContextTest extends ProxyContextRestorer {
@Test
public void assertConnectionsUnlimited() {
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().getValue(ConfigurationPropertyKey.PROXY_FRONTEND_MAX_CONNECTIONS)).thenReturn(0);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().getValue(ConfigurationPropertyKey.PROXY_FRONTEND_MAX_CONNECTIONS)).thenReturn(0);
assertFalse(ConnectionLimitContext.getInstance().limitsMaxConnections());
}
}
diff --git a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/netty/CDCChannelInboundHandlerTest.java b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/netty/CDCChannelInboundHandlerTest.java
index bec73ef14fb..845a270356f 100644
--- a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/netty/CDCChannelInboundHandlerTest.java
+++ b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/netty/CDCChannelInboundHandlerTest.java
@@ -67,7 +67,7 @@ public final class CDCChannelInboundHandlerTest {
ProxyContext mockedProxyContext = mock(ProxyContext.class, RETURNS_DEEP_STUBS);
proxyContext.when(ProxyContext::getInstance).thenReturn(mockedProxyContext);
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
- when(mockedProxyContext.getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(mockedProxyContext.getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
List<ShardingSphereRule> rules = Collections.singletonList(mockAuthRule());
when(globalRuleMetaData.getRules()).thenReturn(rules);
}
diff --git a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/netty/FrontendChannelInboundHandlerTest.java b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/netty/FrontendChannelInboundHandlerTest.java
index 9e81dbc0547..b275e765c45 100644
--- a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/netty/FrontendChannelInboundHandlerTest.java
+++ b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/netty/FrontendChannelInboundHandlerTest.java
@@ -79,7 +79,7 @@ public final class FrontendChannelInboundHandlerTest {
ProxyContext mockedProxyContext = mock(ProxyContext.class, RETURNS_DEEP_STUBS);
mocked.when(ProxyContext::getInstance).thenReturn(mockedProxyContext);
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
- when(mockedProxyContext.getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(mockedProxyContext.getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
when(globalRuleMetaData.getSingleRule(TransactionRule.class)).thenReturn(mock(TransactionRule.class));
frontendChannelInboundHandler = new FrontendChannelInboundHandler(frontendEngine, channel);
}
diff --git a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactoryTest.java b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactoryTest.java
index e7e91c3ba6c..2a6766ffe32 100644
--- a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactoryTest.java
+++ b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactoryTest.java
@@ -27,8 +27,8 @@ import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.frontend.ProxyContextRestorer;
import org.junit.Test;
@@ -51,22 +51,22 @@ public final class FrontDatabaseProtocolTypeFactoryTest extends ProxyContextRest
@Test
public void assertGetDatabaseTypeWhenThrowShardingSphereConfigurationException() {
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(Collections.emptyMap(), mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new Properties())));
- ProxyContext.init(new ContextManager(metadataContexts, mock(InstanceContext.class)));
- assertTrue(metadataContexts.getMetadata().getDatabases().isEmpty());
+ ProxyContext.init(new ContextManager(metaDataContexts, mock(InstanceContext.class)));
+ assertTrue(metaDataContexts.getMetaData().getDatabases().isEmpty());
assertThat(FrontDatabaseProtocolTypeFactory.getDatabaseType().getType(), is("MySQL"));
}
@Test
public void assertGetDatabaseTypeInstanceOfMySQLDatabaseTypeFromMetaDataContextsSchemaName() {
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(mockDatabases(), mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new Properties())));
- ProxyContext.init(new ContextManager(metadataContexts, mock(InstanceContext.class)));
- assertFalse(metadataContexts.getMetadata().getDatabases().isEmpty());
- String configuredDatabaseType = metadataContexts.getMetadata().getProps().getValue(ConfigurationPropertyKey.PROXY_FRONTEND_DATABASE_PROTOCOL_TYPE);
+ ProxyContext.init(new ContextManager(metaDataContexts, mock(InstanceContext.class)));
+ assertFalse(metaDataContexts.getMetaData().getDatabases().isEmpty());
+ String configuredDatabaseType = metaDataContexts.getMetaData().getProps().getValue(ConfigurationPropertyKey.PROXY_FRONTEND_DATABASE_PROTOCOL_TYPE);
assertTrue(configuredDatabaseType.isEmpty());
- assertTrue(metadataContexts.getMetadata().containsDatabase(DefaultDatabase.LOGIC_NAME));
+ assertTrue(metaDataContexts.getMetaData().containsDatabase(DefaultDatabase.LOGIC_NAME));
DatabaseType databaseType = FrontDatabaseProtocolTypeFactory.getDatabaseType();
assertThat(databaseType, instanceOf(DatabaseType.class));
assertThat(databaseType.getType(), is("MySQL"));
@@ -74,17 +74,17 @@ public final class FrontDatabaseProtocolTypeFactoryTest extends ProxyContextRest
@Test
public void assertGetDatabaseTypeOfPostgreSQLDatabaseTypeFromMetaDataContextsProps() {
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(mockDatabases(), mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(createProperties())));
- ProxyContext.init(new ContextManager(metadataContexts, mock(InstanceContext.class)));
- assertFalse(metadataContexts.getMetadata().getDatabases().isEmpty());
- String configuredDatabaseType = metadataContexts.getMetadata().getProps().getValue(ConfigurationPropertyKey.PROXY_FRONTEND_DATABASE_PROTOCOL_TYPE);
+ ProxyContext.init(new ContextManager(metaDataContexts, mock(InstanceContext.class)));
+ assertFalse(metaDataContexts.getMetaData().getDatabases().isEmpty());
+ String configuredDatabaseType = metaDataContexts.getMetaData().getProps().getValue(ConfigurationPropertyKey.PROXY_FRONTEND_DATABASE_PROTOCOL_TYPE);
assertThat(configuredDatabaseType, is("PostgreSQL"));
- assertTrue(metadataContexts.getMetadata().containsDatabase(DefaultDatabase.LOGIC_NAME));
+ assertTrue(metaDataContexts.getMetaData().containsDatabase(DefaultDatabase.LOGIC_NAME));
DatabaseType databaseType = FrontDatabaseProtocolTypeFactory.getDatabaseType();
assertThat(databaseType, instanceOf(DatabaseType.class));
assertThat(databaseType.getType(), is("PostgreSQL"));
- assertThat(metadataContexts.getMetadata().getDatabase(DefaultDatabase.LOGIC_NAME).getProtocolType(), instanceOf(MySQLDatabaseType.class));
+ assertThat(metaDataContexts.getMetaData().getDatabase(DefaultDatabase.LOGIC_NAME).getProtocolType(), instanceOf(MySQLDatabaseType.class));
}
private Properties createProperties() {
diff --git a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/state/impl/JDBCOKProxyStateTest.java b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/state/impl/JDBCOKProxyStateTest.java
index 04cff854083..672c5e6a721 100644
--- a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/state/impl/JDBCOKProxyStateTest.java
+++ b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/state/impl/JDBCOKProxyStateTest.java
@@ -69,7 +69,7 @@ public final class JDBCOKProxyStateTest extends ProxyContextRestorer {
@Test
public void assertExecuteWithProxyHintEnabled() {
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().<Boolean>getValue(ConfigurationPropertyKey.PROXY_HINT_ENABLED)).thenReturn(true);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().<Boolean>getValue(ConfigurationPropertyKey.PROXY_HINT_ENABLED)).thenReturn(true);
ExecutorService executorService = registerMockExecutorService(1);
new JDBCOKProxyState().execute(context, null, frontendEngine, connectionSession);
verify(executorService).execute(any(CommandExecutorTask.class));
@@ -78,7 +78,7 @@ public final class JDBCOKProxyStateTest extends ProxyContextRestorer {
@Test
public void assertExecuteWithDistributedTransaction() {
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().<Boolean>getValue(ConfigurationPropertyKey.PROXY_HINT_ENABLED)).thenReturn(false);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().<Boolean>getValue(ConfigurationPropertyKey.PROXY_HINT_ENABLED)).thenReturn(false);
when(connectionSession.getTransactionStatus().getTransactionType()).thenReturn(TransactionType.XA);
ExecutorService executorService = registerMockExecutorService(1);
new JDBCOKProxyState().execute(context, null, frontendEngine, connectionSession);
@@ -88,9 +88,9 @@ public final class JDBCOKProxyStateTest extends ProxyContextRestorer {
@Test
public void assertExecuteWithProxyBackendExecutorSuitableForOLTP() {
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().<Boolean>getValue(ConfigurationPropertyKey.PROXY_HINT_ENABLED)).thenReturn(false);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().<Boolean>getValue(ConfigurationPropertyKey.PROXY_HINT_ENABLED)).thenReturn(false);
when(ProxyContext.getInstance().getContextManager()
- .getMetadataContexts().getMetadata().getProps().<BackendExecutorType>getValue(ConfigurationPropertyKey.PROXY_BACKEND_EXECUTOR_SUITABLE)).thenReturn(BackendExecutorType.OLTP);
+ .getMetaDataContexts().getMetaData().getProps().<BackendExecutorType>getValue(ConfigurationPropertyKey.PROXY_BACKEND_EXECUTOR_SUITABLE)).thenReturn(BackendExecutorType.OLTP);
EventExecutor eventExecutor = mock(EventExecutor.class);
when(context.executor()).thenReturn(eventExecutor);
new JDBCOKProxyState().execute(context, null, frontendEngine, connectionSession);
@@ -99,9 +99,9 @@ public final class JDBCOKProxyStateTest extends ProxyContextRestorer {
@Test
public void assertExecuteWithProxyBackendExecutorSuitableForOLAPAndRequiredSameThreadForConnection() {
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().<Boolean>getValue(ConfigurationPropertyKey.PROXY_HINT_ENABLED)).thenReturn(false);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().<Boolean>getValue(ConfigurationPropertyKey.PROXY_HINT_ENABLED)).thenReturn(false);
when(ProxyContext.getInstance().getContextManager()
- .getMetadataContexts().getMetadata().getProps().<BackendExecutorType>getValue(ConfigurationPropertyKey.PROXY_BACKEND_EXECUTOR_SUITABLE)).thenReturn(BackendExecutorType.OLAP);
+ .getMetaDataContexts().getMetaData().getProps().<BackendExecutorType>getValue(ConfigurationPropertyKey.PROXY_BACKEND_EXECUTOR_SUITABLE)).thenReturn(BackendExecutorType.OLAP);
when(frontendEngine.getFrontendContext().isRequiredSameThreadForConnection(null)).thenReturn(true);
ExecutorService executorService = registerMockExecutorService(1);
new JDBCOKProxyState().execute(context, null, frontendEngine, connectionSession);
diff --git a/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngine.java b/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngine.java
index 4a39015e7a6..57fe1b0d083 100644
--- a/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngine.java
+++ b/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngine.java
@@ -49,7 +49,7 @@ public final class MySQLFrontendEngine implements DatabaseProtocolFrontendEngine
public MySQLFrontendEngine() {
MySQLServerInfo.setDefaultMysqlVersion(ProxyContext.getInstance()
- .getContextManager().getMetadataContexts().getMetadata().getProps().getValue(ConfigurationPropertyKey.PROXY_MYSQL_DEFAULT_VERSION));
+ .getContextManager().getMetaDataContexts().getMetaData().getProps().getValue(ConfigurationPropertyKey.PROXY_MYSQL_DEFAULT_VERSION));
}
@Override
diff --git a/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandExecuteEngine.java b/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandExecuteEngine.java
index 1eb630342c0..29cd561f2d9 100644
--- a/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandExecuteEngine.java
+++ b/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandExecuteEngine.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.db.protocol.packet.CommandPacketType;
import org.apache.shardingsphere.db.protocol.packet.DatabasePacket;
import org.apache.shardingsphere.db.protocol.payload.PacketPayload;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import org.apache.shardingsphere.proxy.backend.communication.BackendConnection;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.JDBCBackendConnection;
@@ -55,8 +55,8 @@ public final class MySQLCommandExecuteEngine implements CommandExecuteEngine {
@Override
public MySQLCommandPacket getCommandPacket(final PacketPayload payload, final CommandPacketType type, final ConnectionSession connectionSession) throws SQLException {
- MetadataContexts metadataContexts = ProxyContext.getInstance().getContextManager().getMetadataContexts();
- SQLParserRule sqlParserRule = metadataContexts.getMetadata().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
+ MetaDataContexts metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
+ SQLParserRule sqlParserRule = metaDataContexts.getMetaData().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
return MySQLCommandPacketFactory.newInstance((MySQLCommandPacketType) type, (MySQLPacketPayload) payload, connectionSession, sqlParserRule.isSqlCommentParseEnabled());
}
@@ -82,7 +82,7 @@ public final class MySQLCommandExecuteEngine implements CommandExecuteEngine {
return;
}
int count = 0;
- int flushThreshold = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_FRONTEND_FLUSH_THRESHOLD);
+ int flushThreshold = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_FRONTEND_FLUSH_THRESHOLD);
int currentSequenceId = 0;
while (queryCommandExecutor.next()) {
count++;
diff --git a/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/admin/initdb/MySQLComInitDbExecutor.java b/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/admin/initdb/MySQLComInitDbExecutor.java
index 374a24f4e1f..65450a1014f 100644
--- a/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/admin/initdb/MySQLComInitDbExecutor.java
+++ b/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/admin/initdb/MySQLComInitDbExecutor.java
@@ -56,8 +56,8 @@ public final class MySQLComInitDbExecutor implements CommandExecutor {
private Collection<ShardingSphereRule> getRules(final String databaseName) {
Collection<ShardingSphereRule> result;
- result = new LinkedList<>(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase(databaseName).getRuleMetaData().getRules());
- result.addAll(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData().getRules());
+ result = new LinkedList<>(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase(databaseName).getRuleMetaData().getRules());
+ result.addAll(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules());
return result;
}
}
diff --git a/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutor.java b/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutor.java
index 8b170d4c91d..a2f6362ceff 100644
--- a/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutor.java
+++ b/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutor.java
@@ -31,7 +31,7 @@ import org.apache.shardingsphere.infra.binder.SQLStatementContextFactory;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.binder.statement.dml.SelectStatementContext;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeFactory;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
@@ -60,15 +60,15 @@ public final class MySQLComStmtPrepareExecutor implements CommandExecutor {
@Override
public Collection<DatabasePacket<?>> execute() {
failedIfContainsMultiStatements();
- MetadataContexts metadataContexts = ProxyContext.getInstance().getContextManager().getMetadataContexts();
- SQLParserRule sqlParserRule = metadataContexts.getMetadata().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
+ MetaDataContexts metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
+ SQLParserRule sqlParserRule = metaDataContexts.getMetaData().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
SQLStatement sqlStatement = sqlParserRule.getSQLParserEngine(DatabaseTypeFactory.getInstance("MySQL").getType()).parse(packet.getSql(), true);
if (!MySQLComStmtPrepareChecker.isStatementAllowed(sqlStatement)) {
throw new UnsupportedPreparedStatementException();
}
int projectionCount = getProjectionCount(sqlStatement);
int statementId = MySQLStatementIDGenerator.getInstance().nextStatementId(connectionSession.getConnectionId());
- SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata(),
+ SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData(),
sqlStatement, connectionSession.getDefaultDatabaseName());
connectionSession.getServerPreparedStatementRegistry().addPreparedStatement(statementId, new MySQLServerPreparedStatement(packet.getSql(), sqlStatementContext));
return createPackets(statementId, projectionCount, sqlStatement.getParameterCount());
@@ -86,7 +86,7 @@ public final class MySQLComStmtPrepareExecutor implements CommandExecutor {
private int getProjectionCount(final SQLStatement sqlStatement) {
if (sqlStatement instanceof SelectStatement) {
SelectStatementContext sqlStatementContext = (SelectStatementContext) SQLStatementContextFactory
- .newInstance(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata(), sqlStatement, connectionSession.getDatabaseName());
+ .newInstance(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData(), sqlStatement, connectionSession.getDatabaseName());
return sqlStatementContext.getProjectionsContext().getExpandProjections().size();
}
return 0;
diff --git a/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/fieldlist/MySQLComFieldListPacketExecutor.java b/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/fieldlist/MySQLComFieldListPacketExecutor.java
index e1eb41fef2b..3b470f10c4a 100644
--- a/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/fieldlist/MySQLComFieldListPacketExecutor.java
+++ b/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/fieldlist/MySQLComFieldListPacketExecutor.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.infra.binder.QueryContext;
import org.apache.shardingsphere.infra.binder.SQLStatementContextFactory;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeFactory;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import org.apache.shardingsphere.proxy.backend.communication.DatabaseCommunicationEngineFactory;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.JDBCDatabaseCommunicationEngine;
@@ -64,10 +64,10 @@ public final class MySQLComFieldListPacketExecutor implements CommandExecutor {
public Collection<DatabasePacket<?>> execute() throws SQLException {
String databaseName = connectionSession.getDefaultDatabaseName();
String sql = String.format(SQL, packet.getTable(), databaseName);
- MetadataContexts metadataContexts = ProxyContext.getInstance().getContextManager().getMetadataContexts();
- SQLParserRule sqlParserRule = metadataContexts.getMetadata().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
+ MetaDataContexts metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
+ SQLParserRule sqlParserRule = metaDataContexts.getMetaData().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
SQLStatement sqlStatement = sqlParserRule.getSQLParserEngine(DatabaseTypeFactory.getInstance("MySQL").getType()).parse(sql, false);
- SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(metadataContexts.getMetadata(), sqlStatement, databaseName);
+ SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(metaDataContexts.getMetaData(), sqlStatement, databaseName);
JDBCBackendConnection backendConnection = (JDBCBackendConnection) connectionSession.getBackendConnection();
QueryContext queryContext = new QueryContext(sqlStatementContext, sql, Collections.emptyList());
databaseCommunicationEngine = DatabaseCommunicationEngineFactory.getInstance().newDatabaseCommunicationEngine(queryContext, backendConnection, false);
diff --git a/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutor.java b/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutor.java
index 1db3176992d..b07917a09d5 100644
--- a/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutor.java
+++ b/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutor.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.db.protocol.mysql.packet.command.query.text.que
import org.apache.shardingsphere.db.protocol.packet.DatabasePacket;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeFactory;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
@@ -77,8 +77,8 @@ public final class MySQLComQueryPacketExecutor implements QueryCommandExecutor {
if (SQLUtil.trimComment(sql).isEmpty()) {
return new EmptyStatement();
}
- MetadataContexts metadataContexts = ProxyContext.getInstance().getContextManager().getMetadataContexts();
- SQLParserRule sqlParserRule = metadataContexts.getMetadata().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
+ MetaDataContexts metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
+ SQLParserRule sqlParserRule = metaDataContexts.getMetaData().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
return sqlParserRule.getSQLParserEngine(databaseType.getType()).parse(sql, false);
}
diff --git a/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsHandler.java b/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsHandler.java
index 69498f70abe..766092f2438 100644
--- a/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsHandler.java
+++ b/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsHandler.java
@@ -40,7 +40,7 @@ import org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc.JDBCDriv
import org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc.StatementOption;
import org.apache.shardingsphere.infra.parser.ShardingSphereSQLParserEngine;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.JDBCBackendConnection;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.statement.JDBCBackendStatement;
@@ -83,7 +83,7 @@ public final class MySQLMultiStatementsHandler implements ProxyBackendHandler {
private final SQLStatement sqlStatementSample;
- private final MetadataContexts metadataContexts = ProxyContext.getInstance().getContextManager().getMetadataContexts();
+ private final MetaDataContexts metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
private final Map<String, List<ExecutionUnit>> dataSourcesToExecutionUnits = new HashMap<>();
@@ -109,8 +109,8 @@ public final class MySQLMultiStatementsHandler implements ProxyBackendHandler {
}
private ShardingSphereSQLParserEngine getSQLParserEngine() {
- MetadataContexts metadataContexts = ProxyContext.getInstance().getContextManager().getMetadataContexts();
- SQLParserRule sqlParserRule = metadataContexts.getMetadata().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
+ MetaDataContexts metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
+ SQLParserRule sqlParserRule = metaDataContexts.getMetaData().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
return sqlParserRule.getSQLParserEngine(DatabaseTypeFactory.getInstance("MySQL").getType());
}
@@ -121,25 +121,25 @@ public final class MySQLMultiStatementsHandler implements ProxyBackendHandler {
private QueryContext createQueryContext(final String sql, final SQLStatement sqlStatement) {
SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(
- metadataContexts.getMetadata(), Collections.emptyList(), sqlStatement, connectionSession.getDatabaseName());
+ metaDataContexts.getMetaData(), Collections.emptyList(), sqlStatement, connectionSession.getDatabaseName());
return new QueryContext(sqlStatementContext, sql, Collections.emptyList());
}
private ExecutionContext createExecutionContext(final QueryContext queryContext) {
SQLCheckEngine.check(queryContext.getSqlStatementContext(), queryContext.getParameters(),
- metadataContexts.getMetadata().getDatabase(connectionSession.getDatabaseName()).getRuleMetaData().getRules(),
- connectionSession.getDatabaseName(), metadataContexts.getMetadata().getDatabases(), null);
- return kernelProcessor.generateExecutionContext(queryContext, metadataContexts.getMetadata().getDatabase(connectionSession.getDatabaseName()),
- metadataContexts.getMetadata().getGlobalRuleMetaData(), metadataContexts.getMetadata().getProps(), connectionSession.getConnectionContext());
+ metaDataContexts.getMetaData().getDatabase(connectionSession.getDatabaseName()).getRuleMetaData().getRules(),
+ connectionSession.getDatabaseName(), metaDataContexts.getMetaData().getDatabases(), null);
+ return kernelProcessor.generateExecutionContext(queryContext, metaDataContexts.getMetaData().getDatabase(connectionSession.getDatabaseName()),
+ metaDataContexts.getMetaData().getGlobalRuleMetaData(), metaDataContexts.getMetaData().getProps(), connectionSession.getConnectionContext());
}
@Override
public ResponseHeader execute() throws SQLException {
- Collection<ShardingSphereRule> rules = metadataContexts.getMetadata().getDatabase(connectionSession.getDatabaseName()).getRuleMetaData().getRules();
- DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine = new DriverExecutionPrepareEngine<>(JDBCDriverType.STATEMENT, metadataContexts.getMetadata().getProps()
+ Collection<ShardingSphereRule> rules = metaDataContexts.getMetaData().getDatabase(connectionSession.getDatabaseName()).getRuleMetaData().getRules();
+ DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine = new DriverExecutionPrepareEngine<>(JDBCDriverType.STATEMENT, metaDataContexts.getMetaData().getProps()
.<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY), (JDBCBackendConnection) connectionSession.getBackendConnection(),
(JDBCBackendStatement) connectionSession.getStatementManager(), new StatementOption(false), rules,
- metadataContexts.getMetadata().getDatabase(connectionSession.getDatabaseName()).getResourceMetaData().getStorageTypes());
+ metaDataContexts.getMetaData().getDatabase(connectionSession.getDatabaseName()).getResourceMetaData().getStorageTypes());
ExecutionGroupContext<JDBCExecutionUnit> executionGroupContext = prepareEngine.prepare(anyExecutionContext.getRouteContext(), samplingExecutionUnit());
for (ExecutionGroup<JDBCExecutionUnit> eachGroup : executionGroupContext.getInputGroups()) {
for (JDBCExecutionUnit each : eachGroup.getInputs()) {
@@ -166,7 +166,7 @@ public final class MySQLMultiStatementsHandler implements ProxyBackendHandler {
private UpdateResponseHeader executeBatchedStatements(final ExecutionGroupContext<JDBCExecutionUnit> executionGroupContext) throws SQLException {
boolean isExceptionThrown = SQLExecutorExceptionHandler.isExceptionThrown();
- Map<String, DatabaseType> storageTypes = metadataContexts.getMetadata().getDatabase(connectionSession.getDatabaseName()).getResourceMetaData().getStorageTypes();
+ Map<String, DatabaseType> storageTypes = metaDataContexts.getMetaData().getDatabase(connectionSession.getDatabaseName()).getResourceMetaData().getStorageTypes();
JDBCExecutorCallback<int[]> callback = new BatchedJDBCExecutorCallback(storageTypes, sqlStatementSample, isExceptionThrown);
List<int[]> executeResults = jdbcExecutor.execute(executionGroupContext, callback);
int updated = 0;
diff --git a/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngineTest.java b/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngineTest.java
index 1033578e861..13ee0cdd1e0 100644
--- a/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngineTest.java
+++ b/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngineTest.java
@@ -40,8 +40,8 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.frontend.authentication.AuthenticationResult;
import org.apache.shardingsphere.proxy.frontend.connection.ConnectionIdGenerator;
@@ -168,13 +168,13 @@ public final class MySQLFrontendEngineTest extends ProxyContextRestorer {
private void initProxyContext(final ShardingSphereUser user) {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetadataContexts metadataContexts = getMetadataContexts(user);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ MetaDataContexts metaDataContexts = getMetaDataContexts(user);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
- private MetadataContexts getMetadataContexts(final ShardingSphereUser user) {
- return new MetadataContexts(mock(MetadataPersistService.class),
+ private MetaDataContexts getMetaDataContexts(final ShardingSphereUser user) {
+ return new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(getDatabases(), buildGlobalRuleMetaData(user), new ConfigurationProperties(new Properties())));
}
diff --git a/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationEngineTest.java b/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationEngineTest.java
index f45c7f982ed..9166158d52b 100644
--- a/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationEngineTest.java
+++ b/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationEngineTest.java
@@ -36,8 +36,8 @@ import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.frontend.authentication.AuthenticationResultBuilder;
import org.apache.shardingsphere.proxy.frontend.mysql.ProxyContextRestorer;
@@ -176,9 +176,9 @@ public final class MySQLAuthenticationEngineTest extends ProxyContextRestorer {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
Map<String, ShardingSphereDatabase> databases = new LinkedHashMap<>(1, 1);
databases.put("sharding_db", mock(ShardingSphereDatabase.class));
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class), new ShardingSphereMetaData(databases, mock(ShardingSphereRuleMetaData.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class), new ShardingSphereMetaData(databases, mock(ShardingSphereRuleMetaData.class),
new ConfigurationProperties(new Properties())));
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
diff --git a/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationHandlerTest.java b/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationHandlerTest.java
index ddacdd90a01..4614b9a200f 100644
--- a/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationHandlerTest.java
+++ b/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationHandlerTest.java
@@ -34,8 +34,8 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.frontend.mysql.ProxyContextRestorer;
import org.apache.shardingsphere.proxy.frontend.mysql.authentication.authenticator.MySQLAuthenticator;
@@ -131,13 +131,13 @@ public final class MySQLAuthenticationHandlerTest extends ProxyContextRestorer {
@SneakyThrows(ReflectiveOperationException.class)
private void initProxyContext(final ShardingSphereUser user, final boolean isNeedSuper) {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetadataContexts metadataContexts = getMetadataContexts(user, isNeedSuper);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ MetaDataContexts metaDataContexts = getMetaDataContexts(user, isNeedSuper);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
- private MetadataContexts getMetadataContexts(final ShardingSphereUser user, final boolean isNeedSuper) throws NoSuchFieldException, IllegalAccessException {
- return new MetadataContexts(mock(MetadataPersistService.class),
+ private MetaDataContexts getMetaDataContexts(final ShardingSphereUser user, final boolean isNeedSuper) throws NoSuchFieldException, IllegalAccessException {
+ return new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(getDatabases(), buildGlobalRuleMetaData(user, isNeedSuper), new ConfigurationProperties(new Properties())));
}
diff --git a/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandExecutorFactoryTest.java b/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandExecutorFactoryTest.java
index ae82dd7b4f1..92f9c1e6aad 100644
--- a/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandExecutorFactoryTest.java
+++ b/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandExecutorFactoryTest.java
@@ -36,8 +36,8 @@ import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.JDBCBackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
@@ -91,9 +91,9 @@ public final class MySQLCommandExecutorFactoryTest extends ProxyContextRestorer
Map<String, ShardingSphereDatabase> databases = new LinkedHashMap<>(1, 1);
databases.put("logic_db", database);
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(databases, mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new Properties())));
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
diff --git a/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutorTest.java b/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutorTest.java
index c757d1f2014..d455c75f7fe 100644
--- a/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutorTest.java
+++ b/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutorTest.java
@@ -39,8 +39,8 @@ import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.JDBCBackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.handler.ProxyBackendHandler;
@@ -111,10 +111,10 @@ public final class MySQLComStmtExecuteExecutorTest extends ProxyContextRestorer
Map<String, ShardingSphereDatabase> databases = new LinkedHashMap<>(1, 1);
databases.put("logic_db", mockDatabase());
ShardingSphereRuleMetaData metaData = mock(ShardingSphereRuleMetaData.class);
- MetadataContexts metadataContexts = new MetadataContexts(mock(MetadataPersistService.class),
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(databases, metaData, new ConfigurationProperties(new Properties())));
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
when(connectionSession.getAttributeMap().attr(MySQLConstants.MYSQL_CHARACTER_SET_ATTRIBUTE_KEY).get()).thenReturn(MySQLCharacterSet.UTF8MB4_GENERAL_CI);
when(connectionSession.getBackendConnection()).thenReturn(backendConnection);
diff --git a/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutorTest.java b/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutorTest.java
index 0359b2485a8..3e6a21e1e37 100644
--- a/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutorTest.java
+++ b/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutorTest.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.infra.binder.statement.dml.UpdateStatementConte
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.parser.config.SQLParserRuleConfiguration;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
@@ -78,12 +78,12 @@ public final class MySQLComStmtPrepareExecutorTest extends ProxyContextRestorer
private void prepareSQLParser() {
ContextManager contextManager = ProxyContext.getInstance().getContextManager();
- MetadataContexts metadataContexts = contextManager.getMetadataContexts();
- when(metadataContexts.getMetadata().getGlobalRuleMetaData()).thenReturn(mock(ShardingSphereRuleMetaData.class));
+ MetaDataContexts metaDataContexts = contextManager.getMetaDataContexts();
+ when(metaDataContexts.getMetaData().getGlobalRuleMetaData()).thenReturn(mock(ShardingSphereRuleMetaData.class));
CacheOption cacheOption = new CacheOption(1024, 1024);
- when(metadataContexts.getMetadata().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class))
+ when(metaDataContexts.getMetaData().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class))
.thenReturn(new SQLParserRule(new SQLParserRuleConfiguration(false, cacheOption, cacheOption)));
- when(metadataContexts.getMetadata().getDatabase(connectionSession.getDatabaseName()).getProtocolType()).thenReturn(new MySQLDatabaseType());
+ when(metaDataContexts.getMetaData().getDatabase(connectionSession.getDatabaseName()).getProtocolType()).thenReturn(new MySQLDatabaseType());
}
@Test(expected = UnsupportedPreparedStatementException.class)
diff --git a/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutorTest.java b/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutorTest.java
index 8f976561226..831340ba627 100644
--- a/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutorTest.java
+++ b/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutorTest.java
@@ -112,15 +112,15 @@ public final class MySQLComQueryPacketExecutorTest {
try (MockedStatic<ProxyContext> mockedStatic = mockStatic(ProxyContext.class)) {
ProxyContext mockedProxyContext = mock(ProxyContext.class, RETURNS_DEEP_STUBS);
mockedStatic.when(ProxyContext::getInstance).thenReturn(mockedProxyContext);
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase("db_name").getResourceMetaData().getStorageTypes())
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase("db_name").getResourceMetaData().getStorageTypes())
.thenReturn(Collections.singletonMap("ds_0", new MySQLDatabaseType()));
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase("db_name").getProtocolType()).thenReturn(new MySQLDatabaseType());
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase("db_name").getProtocolType()).thenReturn(new MySQLDatabaseType());
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
when(globalRuleMetaData.getSingleRule(SQLParserRule.class)).thenReturn(new SQLParserRule(new DefaultSQLParserRuleConfigurationBuilder().build()));
when(globalRuleMetaData.getSingleRule(SQLTranslatorRule.class)).thenReturn(new SQLTranslatorRule(new DefaultSQLTranslatorRuleConfigurationBuilder().build()));
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE)).thenReturn(1);
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().<Boolean>getValue(ConfigurationPropertyKey.SQL_SHOW)).thenReturn(false);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE)).thenReturn(1);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().<Boolean>getValue(ConfigurationPropertyKey.SQL_SHOW)).thenReturn(false);
MySQLComQueryPacketExecutor actual = new MySQLComQueryPacketExecutor(packet, connectionSession);
MemberAccessor accessor = Plugins.getMemberAccessor();
accessor.set(MySQLComQueryPacketExecutor.class.getDeclaredField("proxyBackendHandler"), actual, proxyBackendHandler);
diff --git a/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsHandlerTest.java b/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsHandlerTest.java
index 388a40cbd4b..afc600bce4a 100644
--- a/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsHandlerTest.java
+++ b/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsHandlerTest.java
@@ -89,19 +89,19 @@ public final class MySQLMultiStatementsHandlerTest {
MySQLUpdateStatement expectedStatement = mock(MySQLUpdateStatement.class);
try (MockedStatic<ProxyContext> mockedStatic = mockStatic(ProxyContext.class)) {
mockedStatic.when(ProxyContext::getInstance).thenReturn(proxyContext);
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase("db").getResourceMetaData().getAllInstanceDataSourceNames())
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase("db").getResourceMetaData().getAllInstanceDataSourceNames())
.thenReturn(Collections.singletonList("ds_0"));
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase("db").getResourceMetaData().getStorageTypes())
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase("db").getResourceMetaData().getStorageTypes())
.thenReturn(Collections.singletonMap("ds_0", new MySQLDatabaseType()));
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase("db").getProtocolType()).thenReturn(new MySQLDatabaseType());
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase("db").getProtocolType()).thenReturn(new MySQLDatabaseType());
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
when(globalRuleMetaData.getSingleRule(SQLParserRule.class)).thenReturn(new SQLParserRule(new DefaultSQLParserRuleConfigurationBuilder().build()));
when(globalRuleMetaData.getSingleRule(SQLTranslatorRule.class)).thenReturn(new SQLTranslatorRule(new DefaultSQLTranslatorRuleConfigurationBuilder().build()));
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE)).thenReturn(1);
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().<Boolean>getValue(ConfigurationPropertyKey.SQL_SHOW)).thenReturn(false);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE)).thenReturn(1);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().<Boolean>getValue(ConfigurationPropertyKey.SQL_SHOW)).thenReturn(false);
when(ProxyContext.getInstance()
- .getContextManager().getMetadataContexts().getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY)).thenReturn(1);
+ .getContextManager().getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY)).thenReturn(1);
ResponseHeader actual = new MySQLMultiStatementsHandler(connectionSession, expectedStatement, sql).execute();
assertThat(actual, instanceOf(UpdateResponseHeader.class));
UpdateResponseHeader actualHeader = (UpdateResponseHeader) actual;
diff --git a/proxy/frontend/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationEngine.java b/proxy/frontend/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationEngine.java
index dc8c99d48db..a7b70dce8cb 100644
--- a/proxy/frontend/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationEngine.java
+++ b/proxy/frontend/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationEngine.java
@@ -121,7 +121,7 @@ public final class OpenGaussAuthenticationEngine implements AuthenticationEngine
if (version >= OpenGaussProtocolVersion.PROTOCOL_350.getVersion()) {
return "";
}
- String password = ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData().findSingleRule(AuthorityRule.class)
+ String password = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().findSingleRule(AuthorityRule.class)
.flatMap(authorityRule -> authorityRule.findUser(new Grantee(username, "%"))).map(ShardingSphereUser::getPassword).orElse("");
return OpenGaussAuthenticationHandler.calculateServerSignature(password, saltHexString, nonceHexString, serverIteration);
}
diff --git a/proxy/frontend/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationHandler.java b/proxy/frontend/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationHandler.java
index 9c6d39fcc8e..a066dc45048 100644
--- a/proxy/frontend/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationHandler.java
+++ b/proxy/frontend/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationHandler.java
@@ -124,9 +124,9 @@ public final class OpenGaussAuthenticationHandler {
private static Collection<ShardingSphereRule> getRules(final String databaseName) {
Collection<ShardingSphereRule> result = new LinkedList<>();
if (!Strings.isNullOrEmpty(databaseName) && ProxyContext.getInstance().databaseExists(databaseName)) {
- result.addAll(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase(databaseName).getRuleMetaData().getRules());
+ result.addAll(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase(databaseName).getRuleMetaData().getRules());
}
- result.addAll(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData().getRules());
+ result.addAll(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules());
return result;
}
diff --git a/proxy/frontend/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationEngineTest.java b/proxy/frontend/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationEngineTest.java
index a6a1975541d..774270a8278 100644
--- a/proxy/frontend/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationEngineTest.java
+++ b/proxy/frontend/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationEngineTest.java
@@ -40,8 +40,8 @@ import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.frontend.authentication.AuthenticationResult;
import org.apache.shardingsphere.proxy.frontend.opengauss.ProxyContextRestorer;
@@ -133,9 +133,9 @@ public final class OpenGaussAuthenticationEngineTest extends ProxyContextRestore
}
private void assertLogin(final String inputPassword) {
- MetadataContexts metadataContexts = getMetadataContexts(new ShardingSphereUser(username, password, ""));
+ MetaDataContexts metaDataContexts = getMetaDataContexts(new ShardingSphereUser(username, password, ""));
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
PostgreSQLPacketPayload payload = new PostgreSQLPacketPayload(createByteBuf(16, 128), StandardCharsets.UTF_8);
payload.writeInt4(64);
@@ -167,8 +167,8 @@ public final class OpenGaussAuthenticationEngineTest extends ProxyContextRestore
return new UnpooledHeapByteBuf(UnpooledByteBufAllocator.DEFAULT, initialCapacity, maxCapacity);
}
- private MetadataContexts getMetadataContexts(final ShardingSphereUser user) {
- return new MetadataContexts(mock(MetadataPersistService.class),
+ private MetaDataContexts getMetaDataContexts(final ShardingSphereUser user) {
+ return new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(new LinkedHashMap<>(), buildGlobalRuleMetaData(user), new ConfigurationProperties(new Properties())));
}
diff --git a/proxy/frontend/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationHandlerTest.java b/proxy/frontend/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationHandlerTest.java
index 50e343c984d..545e6d737e0 100644
--- a/proxy/frontend/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationHandlerTest.java
+++ b/proxy/frontend/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationHandlerTest.java
@@ -40,8 +40,8 @@ import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRule
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.frontend.opengauss.ProxyContextRestorer;
import org.apache.shardingsphere.proxy.frontend.opengauss.authentication.fixture.OpenGaussAuthenticationAlgorithm;
@@ -112,13 +112,13 @@ public final class OpenGaussAuthenticationHandlerTest extends ProxyContextRestor
private void initProxyContext(final ShardingSphereUser user) {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetadataContexts metadataContexts = getMetadataContexts(user);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ MetaDataContexts metaDataContexts = getMetaDataContexts(user);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
- private MetadataContexts getMetadataContexts(final ShardingSphereUser user) {
- return new MetadataContexts(mock(MetadataPersistService.class),
+ private MetaDataContexts getMetaDataContexts(final ShardingSphereUser user) {
+ return new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(getDatabases(), buildGlobalRuleMetaData(user), new ConfigurationProperties(new Properties())));
}
diff --git a/proxy/frontend/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/extended/bind/OpenGaussComBatchBindExecutorTest.java b/proxy/frontend/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/extended/bind/OpenGaussComBatchBindExecutorTest.java
index e4388fa5a68..9a5ae65edee 100644
--- a/proxy/frontend/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/extended/bind/OpenGaussComBatchBindExecutorTest.java
+++ b/proxy/frontend/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/extended/bind/OpenGaussComBatchBindExecutorTest.java
@@ -78,15 +78,15 @@ public final class OpenGaussComBatchBindExecutorTest extends ProxyContextRestore
@SuppressWarnings("rawtypes")
@Test
public void assertExecute() throws SQLException {
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE)).thenReturn(0);
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY)).thenReturn(1);
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().<Boolean>getValue(ConfigurationPropertyKey.SQL_SHOW)).thenReturn(false);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE)).thenReturn(0);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY)).thenReturn(1);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().<Boolean>getValue(ConfigurationPropertyKey.SQL_SHOW)).thenReturn(false);
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
when(database.getResourceMetaData().getAllInstanceDataSourceNames()).thenReturn(Collections.singletonList("ds_0"));
when(database.getResourceMetaData().getStorageTypes()).thenReturn(Collections.singletonMap("ds_0", new OpenGaussDatabaseType()));
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase("db")).thenReturn(database);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase("db")).thenReturn(database);
when(globalRuleMetaData.getSingleRule(SQLTranslatorRule.class)).thenReturn(new SQLTranslatorRule(new DefaultSQLTranslatorRuleConfigurationBuilder().build()));
String statement = "S_1";
OpenGaussComBatchBindPacket packet = mock(OpenGaussComBatchBindPacket.class);
diff --git a/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationHandler.java b/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationHandler.java
index 167a62aea87..48c183b9296 100644
--- a/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationHandler.java
+++ b/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationHandler.java
@@ -68,9 +68,9 @@ public final class PostgreSQLAuthenticationHandler {
private Collection<ShardingSphereRule> getRules(final String databaseName) {
Collection<ShardingSphereRule> result = new LinkedList<>();
if (!Strings.isNullOrEmpty(databaseName) && ProxyContext.getInstance().databaseExists(databaseName)) {
- result.addAll(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase(databaseName).getRuleMetaData().getRules());
+ result.addAll(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase(databaseName).getRuleMetaData().getRules());
}
- result.addAll(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData().getRules());
+ result.addAll(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules());
return result;
}
diff --git a/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngine.java b/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngine.java
index 4007f270c16..980e3f3e5bd 100644
--- a/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngine.java
+++ b/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngine.java
@@ -104,7 +104,7 @@ public final class PostgreSQLCommandExecuteEngine implements CommandExecuteEngin
long dataRows = 0;
int flushCount = 0;
int proxyFrontendFlushThreshold = ProxyContext.getInstance()
- .getContextManager().getMetadataContexts().getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_FRONTEND_FLUSH_THRESHOLD);
+ .getContextManager().getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_FRONTEND_FLUSH_THRESHOLD);
while (queryCommandExecutor.next()) {
flushCount++;
while (!context.channel().isWritable() && context.channel().isActive()) {
diff --git a/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutor.java b/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutor.java
index c29cd62fed1..54a4eefb7b2 100644
--- a/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutor.java
+++ b/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutor.java
@@ -40,7 +40,7 @@ import org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc.JDBCDriv
import org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc.StatementOption;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.JDBCBackendConnection;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.statement.JDBCBackendStatement;
import org.apache.shardingsphere.proxy.backend.context.BackendExecutorContext;
@@ -73,7 +73,7 @@ public final class PostgreSQLBatchedStatementsExecutor {
private final ConnectionSession connectionSession;
- private final MetadataContexts metadataContexts;
+ private final MetaDataContexts metaDataContexts;
private final PostgreSQLServerPreparedStatement preparedStatement;
@@ -86,7 +86,7 @@ public final class PostgreSQLBatchedStatementsExecutor {
public PostgreSQLBatchedStatementsExecutor(final ConnectionSession connectionSession, final PostgreSQLServerPreparedStatement preparedStatement, final List<List<Object>> parameterSets) {
jdbcExecutor = new JDBCExecutor(BackendExecutorContext.getInstance().getExecutorEngine(), connectionSession.getConnectionContext());
this.connectionSession = connectionSession;
- metadataContexts = ProxyContext.getInstance().getContextManager().getMetadataContexts();
+ metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
this.preparedStatement = preparedStatement;
Iterator<List<Object>> parameterSetsIterator = parameterSets.iterator();
SQLStatementContext<?> sqlStatementContext = null;
@@ -104,7 +104,7 @@ public final class PostgreSQLBatchedStatementsExecutor {
}
private SQLStatementContext<?> createSQLStatementContext(final List<Object> params) {
- return SQLStatementContextFactory.newInstance(metadataContexts.getMetadata(), params, preparedStatement.getSqlStatementContext().getSqlStatement(),
+ return SQLStatementContextFactory.newInstance(metaDataContexts.getMetaData(), params, preparedStatement.getSqlStatementContext().getSqlStatement(),
connectionSession.getDatabaseName());
}
@@ -127,10 +127,10 @@ public final class PostgreSQLBatchedStatementsExecutor {
private ExecutionContext createExecutionContext(final QueryContext queryContext) {
SQLCheckEngine.check(queryContext.getSqlStatementContext(), queryContext.getParameters(),
- metadataContexts.getMetadata().getDatabase(connectionSession.getDatabaseName()).getRuleMetaData().getRules(),
- connectionSession.getDatabaseName(), metadataContexts.getMetadata().getDatabases(), null);
- return kernelProcessor.generateExecutionContext(queryContext, metadataContexts.getMetadata().getDatabase(connectionSession.getDatabaseName()),
- metadataContexts.getMetadata().getGlobalRuleMetaData(), metadataContexts.getMetadata().getProps(), connectionSession.getConnectionContext());
+ metaDataContexts.getMetaData().getDatabase(connectionSession.getDatabaseName()).getRuleMetaData().getRules(),
+ connectionSession.getDatabaseName(), metaDataContexts.getMetaData().getDatabases(), null);
+ return kernelProcessor.generateExecutionContext(queryContext, metaDataContexts.getMetaData().getDatabase(connectionSession.getDatabaseName()),
+ metaDataContexts.getMetaData().getGlobalRuleMetaData(), metaDataContexts.getMetaData().getProps(), connectionSession.getConnectionContext());
}
/**
@@ -146,11 +146,11 @@ public final class PostgreSQLBatchedStatementsExecutor {
}
private void addBatchedParametersToPreparedStatements() throws SQLException {
- Collection<ShardingSphereRule> rules = metadataContexts.getMetadata().getDatabase(connectionSession.getDatabaseName()).getRuleMetaData().getRules();
+ Collection<ShardingSphereRule> rules = metaDataContexts.getMetaData().getDatabase(connectionSession.getDatabaseName()).getRuleMetaData().getRules();
DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine = new DriverExecutionPrepareEngine<>(JDBCDriverType.PREPARED_STATEMENT,
- metadataContexts.getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY),
+ metaDataContexts.getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY),
(JDBCBackendConnection) connectionSession.getBackendConnection(), (JDBCBackendStatement) connectionSession.getStatementManager(),
- new StatementOption(false), rules, metadataContexts.getMetadata().getDatabase(connectionSession.getDatabaseName()).getResourceMetaData().getStorageTypes());
+ new StatementOption(false), rules, metaDataContexts.getMetaData().getDatabase(connectionSession.getDatabaseName()).getResourceMetaData().getStorageTypes());
executionGroupContext = prepareEngine.prepare(anyExecutionContext.getRouteContext(), executionUnitParams.keySet());
for (ExecutionGroup<JDBCExecutionUnit> eachGroup : executionGroupContext.getInputGroups()) {
for (JDBCExecutionUnit each : eachGroup.getInputs()) {
@@ -177,7 +177,7 @@ public final class PostgreSQLBatchedStatementsExecutor {
private int executeBatchedPreparedStatements() throws SQLException {
boolean isExceptionThrown = SQLExecutorExceptionHandler.isExceptionThrown();
- ShardingSphereDatabase database = metadataContexts.getMetadata().getDatabase(connectionSession.getDatabaseName());
+ ShardingSphereDatabase database = metaDataContexts.getMetaData().getDatabase(connectionSession.getDatabaseName());
Map<String, DatabaseType> storageTypes = database.getResourceMetaData().getStorageTypes();
DatabaseType protocolType = database.getProtocolType();
JDBCExecutorCallback<int[]> callback = new BatchedStatementsJDBCExecutorCallback(protocolType, storageTypes, preparedStatement.getSqlStatementContext().getSqlStatement(), isExceptionThrown);
diff --git a/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutor.java b/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutor.java
index d2c71825bb2..9a64c83c115 100644
--- a/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutor.java
+++ b/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutor.java
@@ -39,7 +39,7 @@ import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereTable;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.util.exception.external.sql.type.generic.UnsupportedSQLOperationException;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.JDBCBackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
@@ -246,14 +246,14 @@ public final class PostgreSQLComDescribeExecutor implements CommandExecutor {
if (!(connectionSession.getBackendConnection() instanceof JDBCBackendConnection)) {
return;
}
- MetadataContexts metadataContexts = ProxyContext.getInstance().getContextManager().getMetadataContexts();
+ MetaDataContexts metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
String databaseName = connectionSession.getDatabaseName();
SQLStatementContext<?> sqlStatementContext =
- SQLStatementContextFactory.newInstance(metadataContexts.getMetadata(), logicPreparedStatement.getSqlStatementContext().getSqlStatement(), databaseName);
+ SQLStatementContextFactory.newInstance(metaDataContexts.getMetaData(), logicPreparedStatement.getSqlStatementContext().getSqlStatement(), databaseName);
QueryContext queryContext = new QueryContext(sqlStatementContext, logicPreparedStatement.getSql(), Collections.emptyList());
ShardingSphereDatabase database = ProxyContext.getInstance().getDatabase(databaseName);
ExecutionContext executionContext = new KernelProcessor().generateExecutionContext(
- queryContext, database, metadataContexts.getMetadata().getGlobalRuleMetaData(), metadataContexts.getMetadata().getProps(), connectionSession.getConnectionContext());
+ queryContext, database, metaDataContexts.getMetaData().getGlobalRuleMetaData(), metaDataContexts.getMetaData().getProps(), connectionSession.getConnectionContext());
ExecutionUnit executionUnitSample = executionContext.getExecutionUnits().iterator().next();
JDBCBackendConnection backendConnection = (JDBCBackendConnection) connectionSession.getBackendConnection();
Connection connection = backendConnection.getConnections(executionUnitSample.getDataSourceName(), 1, ConnectionMode.CONNECTION_STRICTLY).iterator().next();
diff --git a/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutor.java b/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutor.java
index 2866e93e0a2..571a958df6e 100644
--- a/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutor.java
+++ b/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutor.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.infra.binder.SQLStatementContextFactory;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeEngine;
import org.apache.shardingsphere.infra.parser.ShardingSphereSQLParserEngine;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.distsql.DistSQLStatementContext;
@@ -67,7 +67,7 @@ public final class PostgreSQLComParseExecutor implements CommandExecutor {
}
List<PostgreSQLColumnType> paddedColumnTypes = paddingColumnTypes(sqlStatement.getParameterCount(), packet.readParameterTypes());
SQLStatementContext<?> sqlStatementContext = sqlStatement instanceof DistSQLStatement ? new DistSQLStatementContext((DistSQLStatement) sqlStatement)
- : SQLStatementContextFactory.newInstance(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata(),
+ : SQLStatementContextFactory.newInstance(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData(),
sqlStatement, connectionSession.getDefaultDatabaseName());
PostgreSQLServerPreparedStatement serverPreparedStatement = new PostgreSQLServerPreparedStatement(sql, sqlStatementContext, paddedColumnTypes);
connectionSession.getServerPreparedStatementRegistry().addPreparedStatement(packet.getStatementId(), serverPreparedStatement);
@@ -75,9 +75,9 @@ public final class PostgreSQLComParseExecutor implements CommandExecutor {
}
private ShardingSphereSQLParserEngine createShardingSphereSQLParserEngine(final String databaseName) {
- MetadataContexts metadataContexts = ProxyContext.getInstance().getContextManager().getMetadataContexts();
- SQLParserRule sqlParserRule = metadataContexts.getMetadata().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
- return sqlParserRule.getSQLParserEngine(DatabaseTypeEngine.getTrunkDatabaseTypeName(metadataContexts.getMetadata().getDatabase(databaseName).getProtocolType()));
+ MetaDataContexts metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
+ SQLParserRule sqlParserRule = metaDataContexts.getMetaData().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
+ return sqlParserRule.getSQLParserEngine(DatabaseTypeEngine.getTrunkDatabaseTypeName(metaDataContexts.getMetaData().getDatabase(databaseName).getProtocolType()));
}
private String convertSQLToJDBCStyle(final SQLStatement sqlStatement, final String sql) {
diff --git a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationEngineTest.java b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationEngineTest.java
index daa67dc2c1a..374505eab7e 100644
--- a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationEngineTest.java
+++ b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationEngineTest.java
@@ -41,8 +41,8 @@ import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.frontend.authentication.AuthenticationResult;
import org.apache.shardingsphere.proxy.frontend.postgresql.ProxyContextRestorer;
@@ -164,9 +164,9 @@ public final class PostgreSQLAuthenticationEngineTest extends ProxyContextRestor
payload.writeInt1('p');
payload.writeInt4(4 + md5Digest.length() + 1);
payload.writeStringNul(md5Digest);
- MetadataContexts metadataContexts = getMetadataContexts(new ShardingSphereUser(username, password, ""));
+ MetaDataContexts metaDataContexts = getMetaDataContexts(new ShardingSphereUser(username, password, ""));
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
actual = engine.authenticate(channelHandlerContext, payload);
assertThat(actual.isFinished(), is(password.equals(inputPassword)));
@@ -176,8 +176,8 @@ public final class PostgreSQLAuthenticationEngineTest extends ProxyContextRestor
return new UnpooledHeapByteBuf(UnpooledByteBufAllocator.DEFAULT, initialCapacity, maxCapacity);
}
- private MetadataContexts getMetadataContexts(final ShardingSphereUser user) {
- return new MetadataContexts(mock(MetadataPersistService.class),
+ private MetaDataContexts getMetaDataContexts(final ShardingSphereUser user) {
+ return new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(new LinkedHashMap<>(), buildGlobalRuleMetaData(user), new ConfigurationProperties(new Properties())));
}
diff --git a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationHandlerTest.java b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationHandlerTest.java
index 231c12d5278..c8239ea6abd 100644
--- a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationHandlerTest.java
+++ b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationHandlerTest.java
@@ -40,8 +40,8 @@ import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRule
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.frontend.postgresql.ProxyContextRestorer;
import org.apache.shardingsphere.proxy.frontend.postgresql.authentication.authenticator.PostgreSQLAuthenticator;
@@ -119,13 +119,13 @@ public final class PostgreSQLAuthenticationHandlerTest extends ProxyContextResto
private void initProxyContext(final ShardingSphereUser user) {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetadataContexts metadataContexts = getMetadataContexts(user);
- when(contextManager.getMetadataContexts()).thenReturn(metadataContexts);
+ MetaDataContexts metaDataContexts = getMetaDataContexts(user);
+ when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
- private MetadataContexts getMetadataContexts(final ShardingSphereUser user) {
- return new MetadataContexts(mock(MetadataPersistService.class),
+ private MetaDataContexts getMetaDataContexts(final ShardingSphereUser user) {
+ return new MetaDataContexts(mock(MetaDataPersistService.class),
new ShardingSphereMetaData(getDatabases(), buildGlobalRuleMetaData(user), new ConfigurationProperties(new Properties())));
}
diff --git a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngineTest.java b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngineTest.java
index 78314eece18..51448cdece0 100644
--- a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngineTest.java
+++ b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngineTest.java
@@ -25,8 +25,8 @@ import org.apache.shardingsphere.db.protocol.postgresql.packet.generic.PostgreSQ
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.JDBCBackendConnection;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.ResourceLock;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
@@ -68,7 +68,7 @@ public final class PostgreSQLCommandExecuteEngineTest extends ProxyContextRestor
@Before
public void setUp() {
- ProxyContext.init(new ContextManager(new MetadataContexts(mock(MetadataPersistService.class), new ShardingSphereMetaData()), mock(InstanceContext.class)));
+ ProxyContext.init(new ContextManager(new MetaDataContexts(mock(MetaDataPersistService.class), new ShardingSphereMetaData()), mock(InstanceContext.class)));
when(channelHandlerContext.channel()).thenReturn(channel);
when(connectionSession.getTransactionStatus()).thenReturn(new TransactionStatus(TransactionType.LOCAL));
}
diff --git a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/JDBCPortalTest.java b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/JDBCPortalTest.java
index a0488445c59..053a438a25c 100644
--- a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/JDBCPortalTest.java
+++ b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/JDBCPortalTest.java
@@ -103,8 +103,8 @@ public final class JDBCPortalTest extends ProxyContextRestorer {
@Before
public void setup() {
ProxyContext.init(mockContextManager);
- when(mockContextManager.getMetadataContexts().getMetadata().containsDatabase("db")).thenReturn(true);
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().getValue(ConfigurationPropertyKey.SQL_SHOW)).thenReturn(false);
+ when(mockContextManager.getMetaDataContexts().getMetaData().containsDatabase("db")).thenReturn(true);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().getValue(ConfigurationPropertyKey.SQL_SHOW)).thenReturn(false);
when(connectionSession.getDefaultDatabaseName()).thenReturn("db");
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
when(database.getProtocolType()).thenReturn(new PostgreSQLDatabaseType());
diff --git a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLAggregatedBatchedStatementsCommandExecutorTest.java b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLAggregatedBatchedStatementsCommandExecutorTest.java
index 785cb54d0db..1b12f8573b7 100644
--- a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLAggregatedBatchedStatementsCommandExecutorTest.java
+++ b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLAggregatedBatchedStatementsCommandExecutorTest.java
@@ -89,11 +89,11 @@ public final class PostgreSQLAggregatedBatchedStatementsCommandExecutorTest exte
@SuppressWarnings("rawtypes")
@Test
public void assertExecute() throws SQLException {
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE)).thenReturn(0);
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY)).thenReturn(1);
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().<Boolean>getValue(ConfigurationPropertyKey.SQL_SHOW)).thenReturn(false);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE)).thenReturn(0);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY)).thenReturn(1);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().<Boolean>getValue(ConfigurationPropertyKey.SQL_SHOW)).thenReturn(false);
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
when(globalRuleMetaData.getSingleRule(SQLTranslatorRule.class)).thenReturn(new SQLTranslatorRule(new DefaultSQLTranslatorRuleConfigurationBuilder().build()));
ConnectionSession connectionSession = mock(ConnectionSession.class);
when(connectionSession.getDatabaseName()).thenReturn("db");
@@ -102,7 +102,7 @@ public final class PostgreSQLAggregatedBatchedStatementsCommandExecutorTest exte
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
when(database.getResourceMetaData().getAllInstanceDataSourceNames()).thenReturn(Collections.singletonList("ds_0"));
when(database.getResourceMetaData().getStorageTypes()).thenReturn(Collections.singletonMap("ds_0", new PostgreSQLDatabaseType()));
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase("db")).thenReturn(database);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase("db")).thenReturn(database);
SQLStatement sqlStatement = SQL_PARSER_ENGINE.parse(SQL, false);
SQLStatementContext sqlStatementContext = mock(InsertStatementContext.class);
when(sqlStatementContext.getSqlStatement()).thenReturn(sqlStatement);
diff --git a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java
index 069d821afef..0ee7652967b 100644
--- a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java
+++ b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java
@@ -89,15 +89,15 @@ public final class PostgreSQLBatchedStatementsExecutorTest extends ProxyContextR
when(connectionSession.getStatementManager()).thenReturn(backendStatement);
when(connectionSession.getConnectionContext()).thenReturn(new ConnectionContext());
ProxyContext.init(contextManager);
- when(contextManager.getMetadataContexts().getMetadata().getProps().getValue(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE)).thenReturn(1);
- when(contextManager.getMetadataContexts().getMetadata().getProps().getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY)).thenReturn(1);
- when(contextManager.getMetadataContexts().getMetadata().getProps().getValue(ConfigurationPropertyKey.SQL_SHOW)).thenReturn(false);
+ when(contextManager.getMetaDataContexts().getMetaData().getProps().getValue(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE)).thenReturn(1);
+ when(contextManager.getMetaDataContexts().getMetaData().getProps().getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY)).thenReturn(1);
+ when(contextManager.getMetaDataContexts().getMetaData().getProps().getValue(ConfigurationPropertyKey.SQL_SHOW)).thenReturn(false);
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
when(database.getResourceMetaData().getStorageTypes()).thenReturn(Collections.singletonMap("ds_0", new PostgreSQLDatabaseType()));
when(database.getResourceMetaData().getAllInstanceDataSourceNames()).thenReturn(Collections.singletonList("ds_0"));
- when(contextManager.getMetadataContexts().getMetadata().getDatabase("db")).thenReturn(database);
+ when(contextManager.getMetaDataContexts().getMetaData().getDatabase("db")).thenReturn(database);
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
when(globalRuleMetaData.getSingleRule(SQLTranslatorRule.class)).thenReturn(new SQLTranslatorRule(new DefaultSQLTranslatorRuleConfigurationBuilder().build()));
}
diff --git a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/bind/PostgreSQLComBindExecutorTest.java b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/bind/PostgreSQLComBindExecutorTest.java
index eca2a9fcdc4..a4719d4cbb3 100644
--- a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/bind/PostgreSQLComBindExecutorTest.java
+++ b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/bind/PostgreSQLComBindExecutorTest.java
@@ -73,7 +73,7 @@ public final class PostgreSQLComBindExecutorTest extends ProxyContextRestorer {
public void assertExecuteBind() throws SQLException {
ProxyContext.init(mock(ContextManager.class, RETURNS_DEEP_STUBS));
String databaseName = "postgres";
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().containsDatabase(databaseName)).thenReturn(true);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().containsDatabase(databaseName)).thenReturn(true);
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class);
when(ProxyContext.getInstance().getDatabase(databaseName)).thenReturn(database);
when(database.getProtocolType()).thenReturn(new PostgreSQLDatabaseType());
diff --git a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutorTest.java b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutorTest.java
index 9ed48ecbc37..2b0db7e5f9f 100644
--- a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutorTest.java
+++ b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutorTest.java
@@ -112,13 +112,13 @@ public final class PostgreSQLComDescribeExecutorTest extends ProxyContextRestore
@Before
public void setup() {
ProxyContext.init(contextManager);
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getProps().getValue(ConfigurationPropertyKey.SQL_SHOW)).thenReturn(false);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().getValue(ConfigurationPropertyKey.SQL_SHOW)).thenReturn(false);
when(connectionSession.getDatabaseName()).thenReturn(DATABASE_NAME);
when(connectionSession.getServerPreparedStatementRegistry()).thenReturn(new ServerPreparedStatementRegistry());
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
- when(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
when(globalRuleMetaData.getSingleRule(SQLTranslatorRule.class)).thenReturn(new SQLTranslatorRule(new DefaultSQLTranslatorRuleConfigurationBuilder().build()));
- when(contextManager.getMetadataContexts().getMetadata().getDatabases()).thenReturn(Collections.singletonMap(DATABASE_NAME, mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS)));
+ when(contextManager.getMetaDataContexts().getMetaData().getDatabases()).thenReturn(Collections.singletonMap(DATABASE_NAME, mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS)));
prepareTableMetaData();
}
@@ -129,11 +129,11 @@ public final class PostgreSQLComDescribeExecutorTest extends ProxyContextRestore
new ShardingSphereColumn("c", Types.CHAR, true, false, false, true, false),
new ShardingSphereColumn("pad", Types.CHAR, true, false, false, true, false));
ShardingSphereTable table = new ShardingSphereTable(TABLE_NAME, columnMetaData, Collections.emptyList(), Collections.emptyList());
- when(contextManager.getMetadataContexts().getMetadata().getDatabase(DATABASE_NAME).getSchema("public").getTable(TABLE_NAME)).thenReturn(table);
- when(contextManager.getMetadataContexts().getMetadata().getDatabase(DATABASE_NAME).getProtocolType()).thenReturn(new PostgreSQLDatabaseType());
- when(contextManager.getMetadataContexts().getMetadata().getDatabase(DATABASE_NAME).getResourceMetaData().getStorageTypes())
+ when(contextManager.getMetaDataContexts().getMetaData().getDatabase(DATABASE_NAME).getSchema("public").getTable(TABLE_NAME)).thenReturn(table);
+ when(contextManager.getMetaDataContexts().getMetaData().getDatabase(DATABASE_NAME).getProtocolType()).thenReturn(new PostgreSQLDatabaseType());
+ when(contextManager.getMetaDataContexts().getMetaData().getDatabase(DATABASE_NAME).getResourceMetaData().getStorageTypes())
.thenReturn(Collections.singletonMap("ds_0", new PostgreSQLDatabaseType()));
- when(contextManager.getMetadataContexts().getMetadata().containsDatabase(DATABASE_NAME)).thenReturn(true);
+ when(contextManager.getMetaDataContexts().getMetaData().containsDatabase(DATABASE_NAME)).thenReturn(true);
}
@Test
diff --git a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutorTest.java b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutorTest.java
index 90638f8cc15..a6e473833aa 100644
--- a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutorTest.java
+++ b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutorTest.java
@@ -87,11 +87,11 @@ public final class PostgreSQLComParseExecutorTest extends ProxyContextRestorer {
when(parsePacket.getSql()).thenReturn(expectedSQL);
when(parsePacket.getStatementId()).thenReturn(statementId);
when(connectionSession.getDatabaseName()).thenReturn("db");
- when(mockedContextManager.getMetadataContexts().getMetadata().getDatabase("db").getResourceMetaData().getStorageTypes())
+ when(mockedContextManager.getMetaDataContexts().getMetaData().getDatabase("db").getResourceMetaData().getStorageTypes())
.thenReturn(Collections.singletonMap("ds_0", new PostgreSQLDatabaseType()));
- when(mockedContextManager.getMetadataContexts().getMetadata().getDatabase("db").getProtocolType()).thenReturn(new PostgreSQLDatabaseType());
+ when(mockedContextManager.getMetaDataContexts().getMetaData().getDatabase("db").getProtocolType()).thenReturn(new PostgreSQLDatabaseType());
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
- when(mockedContextManager.getMetadataContexts().getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(mockedContextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
when(globalRuleMetaData.getSingleRule(SQLParserRule.class)).thenReturn(sqlParserRule);
Collection<DatabasePacket<?>> actualPackets = executor.execute();
assertThat(actualPackets.size(), is(1));
@@ -111,11 +111,11 @@ public final class PostgreSQLComParseExecutorTest extends ProxyContextRestorer {
when(parsePacket.getSql()).thenReturn(rawSQL);
when(parsePacket.getStatementId()).thenReturn(statementId);
when(parsePacket.readParameterTypes()).thenReturn(Collections.singletonList(PostgreSQLColumnType.POSTGRESQL_TYPE_INT4));
- when(mockedContextManager.getMetadataContexts().getMetadata().getDatabase("db").getResourceMetaData().getStorageTypes())
+ when(mockedContextManager.getMetaDataContexts().getMetaData().getDatabase("db").getResourceMetaData().getStorageTypes())
.thenReturn(Collections.singletonMap("ds_0", new PostgreSQLDatabaseType()));
- when(mockedContextManager.getMetadataContexts().getMetadata().getDatabase("db").getProtocolType()).thenReturn(new PostgreSQLDatabaseType());
+ when(mockedContextManager.getMetaDataContexts().getMetaData().getDatabase("db").getProtocolType()).thenReturn(new PostgreSQLDatabaseType());
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
- when(mockedContextManager.getMetadataContexts().getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(mockedContextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
when(globalRuleMetaData.getSingleRule(SQLParserRule.class)).thenReturn(sqlParserRule);
when(connectionSession.getDefaultDatabaseName()).thenReturn("db");
when(connectionSession.getDatabaseName()).thenReturn("db");
@@ -144,11 +144,11 @@ public final class PostgreSQLComParseExecutorTest extends ProxyContextRestorer {
when(parsePacket.getSql()).thenReturn(sql);
when(parsePacket.getStatementId()).thenReturn(statementId);
when(connectionSession.getDatabaseName()).thenReturn("db");
- when(mockedContextManager.getMetadataContexts().getMetadata().getDatabase("db").getResourceMetaData().getStorageTypes())
+ when(mockedContextManager.getMetaDataContexts().getMetaData().getDatabase("db").getResourceMetaData().getStorageTypes())
.thenReturn(Collections.singletonMap("ds_0", new PostgreSQLDatabaseType()));
- when(mockedContextManager.getMetadataContexts().getMetadata().getDatabase("db").getProtocolType()).thenReturn(new PostgreSQLDatabaseType());
+ when(mockedContextManager.getMetaDataContexts().getMetaData().getDatabase("db").getProtocolType()).thenReturn(new PostgreSQLDatabaseType());
ShardingSphereRuleMetaData globalRuleMetaData = mock(ShardingSphereRuleMetaData.class);
- when(mockedContextManager.getMetadataContexts().getMetadata().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ when(mockedContextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
when(globalRuleMetaData.getSingleRule(SQLParserRule.class)).thenReturn(sqlParserRule);
Collection<DatabasePacket<?>> actualPackets = executor.execute();
assertThat(actualPackets.size(), is(1));
diff --git a/proxy/frontend/reactive-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/reactive/mysql/command/query/binary/execute/ReactiveMySQLComStmtExecuteExecutor.java b/proxy/frontend/reactive-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/reactive/mysql/command/query/binary/execute/ReactiveMySQLComStmtExecuteExecutor.java
index ca3ef0e262a..79a812a50cd 100644
--- a/proxy/frontend/reactive-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/reactive/mysql/command/query/binary/execute/ReactiveMySQLComStmtExecuteExecutor.java
+++ b/proxy/frontend/reactive-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/reactive/mysql/command/query/binary/execute/ReactiveMySQLComStmtExecuteExecutor.java
@@ -37,7 +37,7 @@ import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeFactory;
import org.apache.shardingsphere.infra.executor.check.SQLCheckEngine;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.proxy.backend.communication.DatabaseCommunicationEngineFactory;
import org.apache.shardingsphere.proxy.backend.communication.vertx.VertxDatabaseCommunicationEngine;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
@@ -95,8 +95,8 @@ public final class ReactiveMySQLComStmtExecuteExecutor implements ReactiveComman
connectionSession.setQueryContext(queryContext);
SQLStatement sqlStatement = preparedStatement.getSqlStatementContext().getSqlStatement();
String databaseName = connectionSession.getDatabaseName();
- MetadataContexts metadataContexts = ProxyContext.getInstance().getContextManager().getMetadataContexts();
- SQLCheckEngine.check(sqlStatementContext, params, getRules(databaseName), databaseName, metadataContexts.getMetadata().getDatabases(), connectionSession.getGrantee());
+ MetaDataContexts metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
+ SQLCheckEngine.check(sqlStatementContext, params, getRules(databaseName), databaseName, metaDataContexts.getMetaData().getDatabases(), connectionSession.getGrantee());
int characterSet = connectionSession.getAttributeMap().attr(MySQLConstants.MYSQL_CHARACTER_SET_ATTRIBUTE_KEY).get().getId();
// TODO Refactor the following branch
if (sqlStatement instanceof TCLStatement) {
@@ -134,8 +134,8 @@ public final class ReactiveMySQLComStmtExecuteExecutor implements ReactiveComman
private static Collection<ShardingSphereRule> getRules(final String databaseName) {
Collection<ShardingSphereRule> result;
- result = new LinkedList<>(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getDatabase(databaseName).getRuleMetaData().getRules());
- result.addAll(ProxyContext.getInstance().getContextManager().getMetadataContexts().getMetadata().getGlobalRuleMetaData().getRules());
+ result = new LinkedList<>(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase(databaseName).getRuleMetaData().getRules());
+ result.addAll(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules());
return result;
}
diff --git a/proxy/frontend/reactive-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/reactive/mysql/command/query/text/fieldlist/ReactiveMySQLComFieldListPacketExecutor.java b/proxy/frontend/reactive-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/reactive/mysql/command/query/text/fieldlist/ReactiveMySQLComFieldListPacketExecutor.java
index b983b505413..e73ea08f60a 100644
--- a/proxy/frontend/reactive-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/reactive/mysql/command/query/text/fieldlist/ReactiveMySQLComFieldListPacketExecutor.java
+++ b/proxy/frontend/reactive-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/reactive/mysql/command/query/text/fieldlist/ReactiveMySQLComFieldListPacketExecutor.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.infra.binder.QueryContext;
import org.apache.shardingsphere.infra.binder.SQLStatementContextFactory;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeFactory;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import org.apache.shardingsphere.proxy.backend.communication.DatabaseCommunicationEngineFactory;
import org.apache.shardingsphere.proxy.backend.communication.vertx.VertxDatabaseCommunicationEngine;
@@ -67,10 +67,10 @@ public final class ReactiveMySQLComFieldListPacketExecutor implements ReactiveCo
this.connectionSession = connectionSession;
databaseName = connectionSession.getDefaultDatabaseName();
String sql = String.format(SQL, packet.getTable(), databaseName);
- MetadataContexts metadataContexts = ProxyContext.getInstance().getContextManager().getMetadataContexts();
- SQLParserRule sqlParserRule = metadataContexts.getMetadata().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
+ MetaDataContexts metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
+ SQLParserRule sqlParserRule = metaDataContexts.getMetaData().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
SQLStatement sqlStatement = sqlParserRule.getSQLParserEngine(DatabaseTypeFactory.getInstance("MySQL").getType()).parse(sql, false);
- SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(metadataContexts.getMetadata(), sqlStatement, databaseName);
+ SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(metaDataContexts.getMetaData(), sqlStatement, databaseName);
databaseCommunicationEngine = DatabaseCommunicationEngineFactory.getInstance().newDatabaseCommunicationEngine(new QueryContext(sqlStatementContext, sql, Collections.emptyList()),
connectionSession.getBackendConnection(), false);
characterSet = connectionSession.getAttributeMap().attr(MySQLConstants.MYSQL_CHARACTER_SET_ATTRIBUTE_KEY).get().getId();
diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtil.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtil.java
index e73e4b18013..48eb188e687 100644
--- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtil.java
+++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtil.java
@@ -44,8 +44,8 @@ import org.apache.shardingsphere.infra.database.DefaultDatabase;
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereColumn;
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereTable;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetadataContexts;
-import org.apache.shardingsphere.mode.metadata.persist.MetadataPersistService;
+import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryFactory;
@@ -106,9 +106,9 @@ public final class PipelineContextUtil {
ConfigurationFileUtil.readFile("config_sharding_sphere_jdbc_source.yaml"));
ShardingSphereDataSource dataSource = (ShardingSphereDataSource) PipelineDataSourceFactory.newInstance(pipelineDataSourceConfig).getDataSource();
ContextManager contextManager = getContextManager(dataSource);
- MetadataPersistService persistService = new MetadataPersistService(getClusterPersistRepository());
- MetadataContexts metadataContexts = renewMetaDataContexts(contextManager.getMetadataContexts(), persistService);
- PipelineContext.initContextManager(new ContextManager(metadataContexts, contextManager.getInstanceContext()));
+ MetaDataPersistService persistService = new MetaDataPersistService(getClusterPersistRepository());
+ MetaDataContexts metaDataContexts = renewMetaDataContexts(contextManager.getMetaDataContexts(), persistService);
+ PipelineContext.initContextManager(new ContextManager(metaDataContexts, contextManager.getInstanceContext()));
}
@SneakyThrows(ReflectiveOperationException.class)
@@ -123,12 +123,12 @@ public final class PipelineContextUtil {
return PERSIST_REPOSITORY_LAZY_INITIALIZER.get();
}
- private static MetadataContexts renewMetaDataContexts(final MetadataContexts old, final MetadataPersistService persistService) {
+ private static MetaDataContexts renewMetaDataContexts(final MetaDataContexts old, final MetaDataPersistService persistService) {
Map<String, ShardingSphereTable> tables = new HashMap<>(3, 1);
tables.put("t_order", new ShardingSphereTable("t_order", Arrays.asList(new ShardingSphereColumn("order_id", Types.INTEGER, true, false, false, true, false),
new ShardingSphereColumn("user_id", Types.VARCHAR, false, false, false, true, false)), Collections.emptyList(), Collections.emptyList()));
- old.getMetadata().getDatabase(DefaultDatabase.LOGIC_NAME).getSchema(DefaultDatabase.LOGIC_NAME).putAll(tables);
- return new MetadataContexts(persistService, old.getMetadata());
+ old.getMetaData().getDatabase(DefaultDatabase.LOGIC_NAME).getSchema(DefaultDatabase.LOGIC_NAME).putAll(tables);
+ return new MetaDataContexts(persistService, old.getMetaData());
}
/**
diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineDistributedBarrierImplTest.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineDistributedBarrierImplTest.java
index 4eed3c9d474..57c0073d1cf 100644
--- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineDistributedBarrierImplTest.java
+++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineDistributedBarrierImplTest.java
@@ -43,7 +43,7 @@ public final class PipelineDistributedBarrierImplTest {
@SuppressWarnings("rawtypes")
public void assertRegisterAndRemove() throws NoSuchFieldException, IllegalAccessException {
String jobId = "j0130317c3054317c7363616c696e675f626d73716c";
- PersistRepository repository = PipelineContext.getContextManager().getMetadataContexts().getPersistService().getRepository();
+ PersistRepository repository = PipelineContext.getContextManager().getMetaDataContexts().getPersistService().getRepository();
... 12 lines suppressed ...