You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/05/23 03:53:02 UTC
[shardingsphere] branch master updated: Add JDBCContext for refresh (#17865)
This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 4acb0eb37fb Add JDBCContext for refresh (#17865)
4acb0eb37fb is described below
commit 4acb0eb37fbd747803ee79c66e1a93aceb10279a
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Mon May 23 11:52:55 2022 +0800
Add JDBCContext for refresh (#17865)
---
.../driver/jdbc/context/JDBCContext.java | 63 ++++++++++++++++++++++
.../core/connection/ShardingSphereConnection.java | 8 +--
.../core/datasource/ShardingSphereDataSource.java | 20 ++-----
.../metadata/ShardingSphereDatabaseMetaData.java | 2 +-
.../shardingsphere/driver/state/DriverState.java | 6 +--
.../driver/state/DriverStateContext.java | 8 +--
.../state/circuit/CircuitBreakDriverState.java | 4 +-
.../driver/state/lock/LockDriverState.java | 4 +-
.../driver/state/ok/OKDriverState.java | 6 +--
.../driver/executor/AbstractBaseExecutorTest.java | 4 +-
.../driver/jdbc/adapter/ConnectionAdapterTest.java | 4 +-
.../connection/ShardingSphereConnectionTest.java | 4 +-
.../ShardingSphereDatabaseMetaDataTest.java | 2 +-
.../UnsupportedOperationConnectionTest.java | 4 +-
.../driver/state/DriverStateContextTest.java | 4 +-
.../state/circuit/CircuitBreakDriverStateTest.java | 4 +-
.../driver/state/fixture/DriverStateFixture.java | 4 +-
.../driver/state/ok/OKDriverStateTest.java | 4 +-
18 files changed, 104 insertions(+), 51 deletions(-)
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/context/JDBCContext.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/context/JDBCContext.java
new file mode 100644
index 00000000000..ba929ee394f
--- /dev/null
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/context/JDBCContext.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.driver.jdbc.context;
+
+import com.google.common.eventbus.Subscribe;
+import lombok.Getter;
+import org.apache.shardingsphere.infra.datasource.pool.creator.DataSourcePoolCreator;
+import org.apache.shardingsphere.infra.metadata.resource.CachedDatabaseMetaData;
+import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.datasource.DataSourceChangedEvent;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * JDBC context.
+ */
+@Getter
+public final class JDBCContext {
+
+ private volatile CachedDatabaseMetaData cachedDatabaseMetaData;
+
+ public JDBCContext(final Map<String, DataSource> dataSources) throws SQLException {
+ cachedDatabaseMetaData = createCachedDatabaseMetaData(dataSources).orElse(null);
+ }
+
+ /**
+ * Refresh cached database meta data.
+ *
+ * @param event data source changed event
+ * @throws SQLException SQL exception
+ */
+ @Subscribe
+ public synchronized void refreshCachedDatabaseMetaData(final DataSourceChangedEvent event) throws SQLException {
+ cachedDatabaseMetaData = createCachedDatabaseMetaData(DataSourcePoolCreator.create(event.getDataSourcePropertiesMap())).orElse(null);
+ }
+
+ private Optional<CachedDatabaseMetaData> createCachedDatabaseMetaData(final Map<String, DataSource> dataSources) throws SQLException {
+ if (dataSources.isEmpty()) {
+ return Optional.empty();
+ }
+ try (Connection connection = dataSources.values().iterator().next().getConnection()) {
+ return Optional.of(new CachedDatabaseMetaData(connection.getMetaData()));
+ }
+ }
+}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnection.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnection.java
index 17540a05fc7..92dbacf1ffe 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnection.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnection.java
@@ -19,10 +19,10 @@ package org.apache.shardingsphere.driver.jdbc.core.connection;
import lombok.Getter;
import org.apache.shardingsphere.driver.jdbc.adapter.AbstractConnectionAdapter;
+import org.apache.shardingsphere.driver.jdbc.context.JDBCContext;
import org.apache.shardingsphere.driver.jdbc.core.datasource.metadata.ShardingSphereDatabaseMetaData;
import org.apache.shardingsphere.driver.jdbc.core.statement.ShardingSpherePreparedStatement;
import org.apache.shardingsphere.driver.jdbc.core.statement.ShardingSphereStatement;
-import org.apache.shardingsphere.infra.metadata.resource.CachedDatabaseMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.traffic.context.TrafficContextHolder;
import org.apache.shardingsphere.transaction.TransactionHolder;
@@ -46,7 +46,7 @@ public final class ShardingSphereConnection extends AbstractConnectionAdapter {
private final ContextManager contextManager;
@Getter
- private final CachedDatabaseMetaData cachedDatabaseMetaData;
+ private final JDBCContext jdbcContext;
@Getter
private final ConnectionManager connectionManager;
@@ -59,10 +59,10 @@ public final class ShardingSphereConnection extends AbstractConnectionAdapter {
private volatile boolean closed;
- public ShardingSphereConnection(final String databaseName, final ContextManager contextManager, final CachedDatabaseMetaData cachedDatabaseMetaData) {
+ public ShardingSphereConnection(final String databaseName, final ContextManager contextManager, final JDBCContext jdbcContext) {
this.databaseName = databaseName;
this.contextManager = contextManager;
- this.cachedDatabaseMetaData = cachedDatabaseMetaData;
+ this.jdbcContext = jdbcContext;
connectionManager = new ConnectionManager(databaseName, contextManager);
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
index cd5052b89b8..c9a87f98a92 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.driver.jdbc.core.datasource;
import org.apache.shardingsphere.driver.jdbc.adapter.AbstractDataSourceAdapter;
+import org.apache.shardingsphere.driver.jdbc.context.JDBCContext;
import org.apache.shardingsphere.driver.state.DriverStateContext;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import org.apache.shardingsphere.infra.config.checker.RuleConfigurationCheckerFactory;
@@ -52,12 +53,12 @@ public final class ShardingSphereDataSource extends AbstractDataSourceAdapter im
private final ContextManager contextManager;
- private volatile CachedDatabaseMetaData cachedDatabaseMetaData;
+ private final JDBCContext jdbcContext;
public ShardingSphereDataSource(final String databaseName, final ModeConfiguration modeConfig) throws SQLException {
this.databaseName = databaseName;
contextManager = createContextManager(databaseName, modeConfig, new HashMap<>(), new LinkedList<>(), new Properties());
- cachedDatabaseMetaData = createCachedDatabaseMetaData(contextManager.getDataSourceMap(databaseName)).orElse(null);
+ jdbcContext = new JDBCContext(contextManager.getDataSourceMap(databaseName));
}
public ShardingSphereDataSource(final String databaseName, final ModeConfiguration modeConfig, final Map<String, DataSource> dataSourceMap,
@@ -65,7 +66,7 @@ public final class ShardingSphereDataSource extends AbstractDataSourceAdapter im
checkRuleConfiguration(databaseName, ruleConfigs);
this.databaseName = databaseName;
contextManager = createContextManager(databaseName, modeConfig, dataSourceMap, ruleConfigs, null == props ? new Properties() : props);
- cachedDatabaseMetaData = createCachedDatabaseMetaData(contextManager.getDataSourceMap(databaseName)).orElse(null);
+ jdbcContext = new JDBCContext(contextManager.getDataSourceMap(databaseName));
}
@SuppressWarnings("unchecked")
@@ -95,8 +96,7 @@ public final class ShardingSphereDataSource extends AbstractDataSourceAdapter im
@Override
public Connection getConnection() throws SQLException {
- assignCachedDatabaseMetaData();
- return DriverStateContext.getConnection(databaseName, contextManager, cachedDatabaseMetaData);
+ return DriverStateContext.getConnection(databaseName, contextManager, jdbcContext);
}
@Override
@@ -104,16 +104,6 @@ public final class ShardingSphereDataSource extends AbstractDataSourceAdapter im
return getConnection();
}
- private void assignCachedDatabaseMetaData() throws SQLException {
- if (null == cachedDatabaseMetaData) {
- synchronized (this) {
- if (null == cachedDatabaseMetaData) {
- cachedDatabaseMetaData = createCachedDatabaseMetaData(contextManager.getDataSourceMap(databaseName)).orElse(null);
- }
- }
- }
- }
-
/**
* Close data sources.
*
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaData.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaData.java
index 6b2ea1948c8..e7539c53dde 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaData.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaData.java
@@ -51,7 +51,7 @@ public final class ShardingSphereDatabaseMetaData extends AdaptedDatabaseMetaDat
private DatabaseMetaData currentDatabaseMetaData;
public ShardingSphereDatabaseMetaData(final ShardingSphereConnection connection) {
- super(connection.getCachedDatabaseMetaData());
+ super(connection.getJdbcContext().getCachedDatabaseMetaData());
this.connection = connection;
rules = connection.getContextManager().getMetaDataContexts().getDatabaseMetaData(connection.getDatabaseName()).getRuleMetaData().getRules();
dataSourcesMetaData = connection.getContextManager().getMetaDataContexts().getDatabaseMetaData(connection.getDatabaseName()).getResource().getDataSourcesMetaData();
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/DriverState.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/DriverState.java
index 197b2d921e6..051e0404288 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/DriverState.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/DriverState.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.driver.state;
-import org.apache.shardingsphere.infra.metadata.resource.CachedDatabaseMetaData;
+import org.apache.shardingsphere.driver.jdbc.context.JDBCContext;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.spi.annotation.SingletonSPI;
import org.apache.shardingsphere.spi.type.typed.TypedSPI;
@@ -35,8 +35,8 @@ public interface DriverState extends TypedSPI {
*
* @param databaseName database name
* @param contextManager context manager
- * @param cachedDatabaseMetaData cached database meta data
+ * @param jdbcContext JDBC context
* @return connection
*/
- Connection getConnection(String databaseName, ContextManager contextManager, CachedDatabaseMetaData cachedDatabaseMetaData);
+ Connection getConnection(String databaseName, ContextManager contextManager, JDBCContext jdbcContext);
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/DriverStateContext.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/DriverStateContext.java
index 5f7966a56e4..126ba9638eb 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/DriverStateContext.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/DriverStateContext.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.driver.state;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.infra.metadata.resource.CachedDatabaseMetaData;
+import org.apache.shardingsphere.driver.jdbc.context.JDBCContext;
import org.apache.shardingsphere.mode.manager.ContextManager;
import java.sql.Connection;
@@ -35,10 +35,10 @@ public final class DriverStateContext {
*
* @param databaseName database name
* @param contextManager context manager
- * @param cachedDatabaseMetaData cached database meta data
+ * @param jdbcContext JDBC context
* @return connection
*/
- public static Connection getConnection(final String databaseName, final ContextManager contextManager, final CachedDatabaseMetaData cachedDatabaseMetaData) {
- return DriverStateFactory.getInstance(contextManager.getInstanceContext().getInstance().getState().getCurrentState()).getConnection(databaseName, contextManager, cachedDatabaseMetaData);
+ public static Connection getConnection(final String databaseName, final ContextManager contextManager, final JDBCContext jdbcContext) {
+ return DriverStateFactory.getInstance(contextManager.getInstanceContext().getInstance().getState().getCurrentState()).getConnection(databaseName, contextManager, jdbcContext);
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/CircuitBreakDriverState.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/CircuitBreakDriverState.java
index da0701c62e0..ef77cda049f 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/CircuitBreakDriverState.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/CircuitBreakDriverState.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.driver.state.circuit;
+import org.apache.shardingsphere.driver.jdbc.context.JDBCContext;
import org.apache.shardingsphere.driver.state.DriverState;
import org.apache.shardingsphere.driver.state.circuit.datasource.CircuitBreakerDataSource;
-import org.apache.shardingsphere.infra.metadata.resource.CachedDatabaseMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
import java.sql.Connection;
@@ -30,7 +30,7 @@ import java.sql.Connection;
public final class CircuitBreakDriverState implements DriverState {
@Override
- public Connection getConnection(final String databaseName, final ContextManager contextManager, final CachedDatabaseMetaData cachedDatabaseMetaData) {
+ public Connection getConnection(final String databaseName, final ContextManager contextManager, final JDBCContext jdbcContext) {
return new CircuitBreakerDataSource().getConnection();
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/lock/LockDriverState.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/lock/LockDriverState.java
index 854d4e11758..62e8629bd68 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/lock/LockDriverState.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/lock/LockDriverState.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.driver.state.lock;
+import org.apache.shardingsphere.driver.jdbc.context.JDBCContext;
import org.apache.shardingsphere.driver.state.DriverState;
-import org.apache.shardingsphere.infra.metadata.resource.CachedDatabaseMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
import java.sql.Connection;
@@ -29,7 +29,7 @@ import java.sql.Connection;
public final class LockDriverState implements DriverState {
@Override
- public Connection getConnection(final String databaseName, final ContextManager contextManager, final CachedDatabaseMetaData cachedDatabaseMetaData) {
+ public Connection getConnection(final String databaseName, final ContextManager contextManager, final JDBCContext jdbcContext) {
// TODO
throw new UnsupportedOperationException("LockDriverState");
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/ok/OKDriverState.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/ok/OKDriverState.java
index 8d258c5c57c..13b31ad35e4 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/ok/OKDriverState.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/ok/OKDriverState.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.driver.state.ok;
+import org.apache.shardingsphere.driver.jdbc.context.JDBCContext;
import org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConnection;
import org.apache.shardingsphere.driver.state.DriverState;
-import org.apache.shardingsphere.infra.metadata.resource.CachedDatabaseMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
import java.sql.Connection;
@@ -30,8 +30,8 @@ import java.sql.Connection;
public final class OKDriverState implements DriverState {
@Override
- public Connection getConnection(final String databaseName, final ContextManager contextManager, final CachedDatabaseMetaData cachedDatabaseMetaData) {
- return new ShardingSphereConnection(databaseName, contextManager, cachedDatabaseMetaData);
+ public Connection getConnection(final String databaseName, final ContextManager contextManager, final JDBCContext jdbcContext) {
+ return new ShardingSphereConnection(databaseName, contextManager, jdbcContext);
}
@Override
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/AbstractBaseExecutorTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/AbstractBaseExecutorTest.java
index f48344151ab..af276c0da1f 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/AbstractBaseExecutorTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/AbstractBaseExecutorTest.java
@@ -19,12 +19,12 @@ package org.apache.shardingsphere.driver.executor;
import lombok.AccessLevel;
import lombok.Getter;
+import org.apache.shardingsphere.driver.jdbc.context.JDBCContext;
import org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConnection;
import org.apache.shardingsphere.infra.database.DefaultDatabase;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeFactory;
import org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutorExceptionHandler;
-import org.apache.shardingsphere.infra.metadata.resource.CachedDatabaseMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
@@ -63,7 +63,7 @@ public abstract class AbstractBaseExecutorTest {
SQLExecutorExceptionHandler.setExceptionThrown(true);
executorEngine = ExecutorEngine.createExecutorEngineWithCPU();
TransactionTypeHolder.set(TransactionType.LOCAL);
- connection = new ShardingSphereConnection(DefaultDatabase.LOGIC_NAME, mockContextManager(), mock(CachedDatabaseMetaData.class));
+ connection = new ShardingSphereConnection(DefaultDatabase.LOGIC_NAME, mockContextManager(), mock(JDBCContext.class));
}
private ContextManager mockContextManager() {
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/ConnectionAdapterTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/ConnectionAdapterTest.java
index e5862a57d00..7814475b04f 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/ConnectionAdapterTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/ConnectionAdapterTest.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.driver.jdbc.adapter;
+import org.apache.shardingsphere.driver.jdbc.context.JDBCContext;
import org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConnection;
import org.apache.shardingsphere.infra.database.DefaultDatabase;
-import org.apache.shardingsphere.infra.metadata.resource.CachedDatabaseMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.transaction.rule.TransactionRule;
import org.junit.Test;
@@ -82,6 +82,6 @@ public final class ConnectionAdapterTest {
private Connection createConnectionAdaptor() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
when(contextManager.getMetaDataContexts().getGlobalRuleMetaData().findSingleRule(TransactionRule.class)).thenReturn(Optional.empty());
- return new ShardingSphereConnection(DefaultDatabase.LOGIC_NAME, contextManager, mock(CachedDatabaseMetaData.class));
+ return new ShardingSphereConnection(DefaultDatabase.LOGIC_NAME, contextManager, mock(JDBCContext.class));
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java
index 03104d1edd1..bdaf1b52008 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java
@@ -18,9 +18,9 @@
package org.apache.shardingsphere.driver.jdbc.core.connection;
import lombok.SneakyThrows;
+import org.apache.shardingsphere.driver.jdbc.context.JDBCContext;
import org.apache.shardingsphere.infra.database.DefaultDatabase;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.ConnectionMode;
-import org.apache.shardingsphere.infra.metadata.resource.CachedDatabaseMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.transaction.ConnectionTransaction;
import org.apache.shardingsphere.transaction.ConnectionTransaction.DistributedTransactionOperationType;
@@ -54,7 +54,7 @@ public final class ShardingSphereConnectionTest {
@Before
public void setUp() throws SQLException {
- connection = new ShardingSphereConnection(DefaultDatabase.LOGIC_NAME, mockContextManager(), mock(CachedDatabaseMetaData.class));
+ connection = new ShardingSphereConnection(DefaultDatabase.LOGIC_NAME, mockContextManager(), mock(JDBCContext.class));
}
private ContextManager mockContextManager() {
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaDataTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaDataTest.java
index 302bb372065..90b0c4cceab 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaDataTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaDataTest.java
@@ -95,7 +95,7 @@ public final class ShardingSphereDatabaseMetaDataTest {
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
when(metaDataContexts.getDatabaseMetaData(shardingSphereConnection.getDatabaseName())).thenReturn(database);
CachedDatabaseMetaData cachedDatabaseMetaData = new CachedDatabaseMetaData(databaseMetaData);
- when(shardingSphereConnection.getCachedDatabaseMetaData()).thenReturn(cachedDatabaseMetaData);
+ when(shardingSphereConnection.getJdbcContext().getCachedDatabaseMetaData()).thenReturn(cachedDatabaseMetaData);
ShardingRule shardingRule = mockShardingRule();
when(database.getRuleMetaData().getRules()).thenReturn(Collections.singleton(shardingRule));
shardingSphereDatabaseMetaData = new ShardingSphereDatabaseMetaData(shardingSphereConnection);
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedOperationConnectionTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedOperationConnectionTest.java
index 7c8d6725ecf..7437ec92162 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedOperationConnectionTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedOperationConnectionTest.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.driver.jdbc.unsupported;
+import org.apache.shardingsphere.driver.jdbc.context.JDBCContext;
import org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConnection;
import org.apache.shardingsphere.infra.database.DefaultDatabase;
-import org.apache.shardingsphere.infra.metadata.resource.CachedDatabaseMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.transaction.rule.TransactionRule;
import org.junit.Test;
@@ -40,7 +40,7 @@ public final class UnsupportedOperationConnectionTest {
public UnsupportedOperationConnectionTest() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
when(contextManager.getMetaDataContexts().getGlobalRuleMetaData().findSingleRule(TransactionRule.class)).thenReturn(Optional.empty());
- shardingSphereConnection = new ShardingSphereConnection(DefaultDatabase.LOGIC_NAME, contextManager, mock(CachedDatabaseMetaData.class));
+ shardingSphereConnection = new ShardingSphereConnection(DefaultDatabase.LOGIC_NAME, contextManager, mock(JDBCContext.class));
}
@Test(expected = SQLFeatureNotSupportedException.class)
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/DriverStateContextTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/DriverStateContextTest.java
index a67a154b26b..5a8685e6f03 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/DriverStateContextTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/DriverStateContextTest.java
@@ -17,13 +17,13 @@
package org.apache.shardingsphere.driver.state;
+import org.apache.shardingsphere.driver.jdbc.context.JDBCContext;
import org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConnection;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.database.DefaultDatabase;
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
import org.apache.shardingsphere.infra.federation.optimizer.context.OptimizerContext;
import org.apache.shardingsphere.infra.metadata.ShardingSphereDatabase;
-import org.apache.shardingsphere.infra.metadata.resource.CachedDatabaseMetaData;
import org.apache.shardingsphere.infra.metadata.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.state.StateContext;
import org.apache.shardingsphere.mode.manager.ContextManager;
@@ -69,7 +69,7 @@ public final class DriverStateContextTest {
@Test
public void assertGetConnectionWithOkState() {
- Connection actual = DriverStateContext.getConnection(DefaultDatabase.LOGIC_NAME, contextManager, mock(CachedDatabaseMetaData.class));
+ Connection actual = DriverStateContext.getConnection(DefaultDatabase.LOGIC_NAME, contextManager, mock(JDBCContext.class));
assertThat(actual, instanceOf(ShardingSphereConnection.class));
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/circuit/CircuitBreakDriverStateTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/circuit/CircuitBreakDriverStateTest.java
index e82cad90aa7..90b98783b66 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/circuit/CircuitBreakDriverStateTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/circuit/CircuitBreakDriverStateTest.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.driver.state.circuit;
+import org.apache.shardingsphere.driver.jdbc.context.JDBCContext;
import org.apache.shardingsphere.driver.state.circuit.connection.CircuitBreakerConnection;
import org.apache.shardingsphere.infra.database.DefaultDatabase;
-import org.apache.shardingsphere.infra.metadata.resource.CachedDatabaseMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.junit.Test;
@@ -34,7 +34,7 @@ public final class CircuitBreakDriverStateTest {
@Test
public void assertGetConnection() {
- Connection actual = new CircuitBreakDriverState().getConnection(DefaultDatabase.LOGIC_NAME, mock(ContextManager.class, RETURNS_DEEP_STUBS), mock(CachedDatabaseMetaData.class));
+ Connection actual = new CircuitBreakDriverState().getConnection(DefaultDatabase.LOGIC_NAME, mock(ContextManager.class, RETURNS_DEEP_STUBS), mock(JDBCContext.class));
assertThat(actual, instanceOf(CircuitBreakerConnection.class));
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/fixture/DriverStateFixture.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/fixture/DriverStateFixture.java
index 9d589b0f883..e422c7ef416 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/fixture/DriverStateFixture.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/fixture/DriverStateFixture.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.driver.state.fixture;
+import org.apache.shardingsphere.driver.jdbc.context.JDBCContext;
import org.apache.shardingsphere.driver.state.DriverState;
-import org.apache.shardingsphere.infra.metadata.resource.CachedDatabaseMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
import java.sql.Connection;
@@ -26,7 +26,7 @@ import java.sql.Connection;
public final class DriverStateFixture implements DriverState {
@Override
- public Connection getConnection(final String databaseName, final ContextManager contextManager, final CachedDatabaseMetaData cachedDatabaseMetaData) {
+ public Connection getConnection(final String databaseName, final ContextManager contextManager, final JDBCContext jdbcContext) {
return null;
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/ok/OKDriverStateTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/ok/OKDriverStateTest.java
index 75a4d7c33b1..88cd1a4ae40 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/ok/OKDriverStateTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/ok/OKDriverStateTest.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.driver.state.ok;
+import org.apache.shardingsphere.driver.jdbc.context.JDBCContext;
import org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConnection;
import org.apache.shardingsphere.infra.database.DefaultDatabase;
-import org.apache.shardingsphere.infra.metadata.resource.CachedDatabaseMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.transaction.rule.TransactionRule;
import org.junit.Test;
@@ -39,7 +39,7 @@ public final class OKDriverStateTest {
public void assertGetConnection() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
when(contextManager.getMetaDataContexts().getGlobalRuleMetaData().findSingleRule(TransactionRule.class)).thenReturn(Optional.empty());
- Connection actual = new OKDriverState().getConnection(DefaultDatabase.LOGIC_NAME, contextManager, mock(CachedDatabaseMetaData.class));
+ Connection actual = new OKDriverState().getConnection(DefaultDatabase.LOGIC_NAME, contextManager, mock(JDBCContext.class));
assertThat(actual, instanceOf(ShardingSphereConnection.class));
}
}