This is an automated email from the ASF dual-hosted git repository.
totalo 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 86bf79aba71 Move CachedDatabaseMetaData to ShardingSphereDataSource
(#17863)
86bf79aba71 is described below
commit 86bf79aba71f3151524f9dcdde3b534ac8eeda97
Author: Liang Zhang <[email protected]>
AuthorDate: Mon May 23 00:53:17 2022 +0800
Move CachedDatabaseMetaData to ShardingSphereDataSource (#17863)
---
.../core/connection/ShardingSphereConnection.java | 9 ++++--
.../core/datasource/ShardingSphereDataSource.java | 32 ++++++++++++++++++++--
.../metadata/ShardingSphereDatabaseMetaData.java | 2 +-
.../shardingsphere/driver/state/DriverState.java | 4 ++-
.../driver/state/DriverStateContext.java | 6 ++--
.../state/circuit/CircuitBreakDriverState.java | 3 +-
.../driver/state/lock/LockDriverState.java | 3 +-
.../driver/state/ok/OKDriverState.java | 5 ++--
.../driver/executor/AbstractBaseExecutorTest.java | 3 +-
.../driver/jdbc/adapter/ConnectionAdapterTest.java | 3 +-
...ractShardingSphereDataSourceForEncryptTest.java | 4 +--
.../connection/ShardingSphereConnectionTest.java | 3 +-
.../ShardingSphereDatabaseMetaDataTest.java | 8 +++---
.../statement/EncryptPreparedStatementTest.java | 2 +-
.../jdbc/core/statement/EncryptStatementTest.java | 2 +-
.../UnsupportedOperationConnectionTest.java | 3 +-
.../driver/state/DriverStateContextTest.java | 3 +-
.../state/circuit/CircuitBreakDriverStateTest.java | 3 +-
.../driver/state/fixture/DriverStateFixture.java | 3 +-
.../driver/state/ok/OKDriverStateTest.java | 3 +-
20 files changed, 75 insertions(+), 29 deletions(-)
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 f5b00911f3d..17540a05fc7 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
@@ -22,6 +22,7 @@ import
org.apache.shardingsphere.driver.jdbc.adapter.AbstractConnectionAdapter;
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;
@@ -44,6 +45,9 @@ public final class ShardingSphereConnection extends
AbstractConnectionAdapter {
@Getter
private final ContextManager contextManager;
+ @Getter
+ private final CachedDatabaseMetaData cachedDatabaseMetaData;
+
@Getter
private final ConnectionManager connectionManager;
@@ -55,9 +59,10 @@ public final class ShardingSphereConnection extends
AbstractConnectionAdapter {
private volatile boolean closed;
- public ShardingSphereConnection(final String databaseName, final
ContextManager contextManager) {
+ public ShardingSphereConnection(final String databaseName, final
ContextManager contextManager, final CachedDatabaseMetaData
cachedDatabaseMetaData) {
this.databaseName = databaseName;
this.contextManager = contextManager;
+ this.cachedDatabaseMetaData = cachedDatabaseMetaData;
connectionManager = new ConnectionManager(databaseName,
contextManager);
}
@@ -252,7 +257,7 @@ public final class ShardingSphereConnection extends
AbstractConnectionAdapter {
}
@Override
- public String getSchema() throws SQLException {
+ public String getSchema() {
// TODO return databaseName for now in getSchema(), the same as before
return databaseName;
}
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 81c09438640..cd5052b89b8 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
@@ -26,6 +26,7 @@ import
org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
import org.apache.shardingsphere.infra.config.scope.GlobalRuleConfiguration;
import org.apache.shardingsphere.infra.instance.definition.InstanceDefinition;
import org.apache.shardingsphere.infra.instance.definition.InstanceType;
+import
org.apache.shardingsphere.infra.metadata.resource.CachedDatabaseMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.manager.ContextManagerBuilderFactory;
import org.apache.shardingsphere.mode.manager.ContextManagerBuilderParameter;
@@ -38,6 +39,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.Map;
+import java.util.Optional;
import java.util.Properties;
import java.util.stream.Collectors;
@@ -50,9 +52,12 @@ public final class ShardingSphereDataSource extends
AbstractDataSourceAdapter im
private final ContextManager contextManager;
+ private volatile CachedDatabaseMetaData cachedDatabaseMetaData;
+
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);
}
public ShardingSphereDataSource(final String databaseName, final
ModeConfiguration modeConfig, final Map<String, DataSource> dataSourceMap,
@@ -60,6 +65,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);
}
@SuppressWarnings("unchecked")
@@ -78,16 +84,36 @@ public final class ShardingSphereDataSource extends
AbstractDataSourceAdapter im
return
ContextManagerBuilderFactory.getInstance(modeConfig).build(parameter);
}
+ 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()));
+ }
+ }
+
@Override
- public Connection getConnection() {
- return DriverStateContext.getConnection(databaseName, contextManager);
+ public Connection getConnection() throws SQLException {
+ assignCachedDatabaseMetaData();
+ return DriverStateContext.getConnection(databaseName, contextManager,
cachedDatabaseMetaData);
}
@Override
- public Connection getConnection(final String username, final String
password) {
+ public Connection getConnection(final String username, final String
password) throws SQLException {
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 e5e7d215078..6b2ea1948c8 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.getContextManager().getMetaDataContexts().getDatabaseMetaData(connection.getDatabaseName()).getResource().getCachedDatabaseMetaData());
+ super(connection.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 14737e43d62..197b2d921e6 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,6 +17,7 @@
package org.apache.shardingsphere.driver.state;
+import
org.apache.shardingsphere.infra.metadata.resource.CachedDatabaseMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.spi.annotation.SingletonSPI;
import org.apache.shardingsphere.spi.type.typed.TypedSPI;
@@ -34,7 +35,8 @@ public interface DriverState extends TypedSPI {
*
* @param databaseName database name
* @param contextManager context manager
+ * @param cachedDatabaseMetaData cached database meta data
* @return connection
*/
- Connection getConnection(String databaseName, ContextManager
contextManager);
+ Connection getConnection(String databaseName, ContextManager
contextManager, CachedDatabaseMetaData cachedDatabaseMetaData);
}
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 5bf67c2117b..5f7966a56e4 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,6 +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.mode.manager.ContextManager;
import java.sql.Connection;
@@ -34,9 +35,10 @@ public final class DriverStateContext {
*
* @param databaseName database name
* @param contextManager context manager
+ * @param cachedDatabaseMetaData cached database meta data
* @return connection
*/
- public static Connection getConnection(final String databaseName, final
ContextManager contextManager) {
- return
DriverStateFactory.getInstance(contextManager.getInstanceContext().getInstance().getState().getCurrentState()).getConnection(databaseName,
contextManager);
+ 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);
}
}
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 aeba242c0b3..da0701c62e0 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
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.driver.state.circuit;
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;
@@ -29,7 +30,7 @@ import java.sql.Connection;
public final class CircuitBreakDriverState implements DriverState {
@Override
- public Connection getConnection(final String databaseName, final
ContextManager contextManager) {
+ public Connection getConnection(final String databaseName, final
ContextManager contextManager, final CachedDatabaseMetaData
cachedDatabaseMetaData) {
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 4389a9dc078..854d4e11758 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
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.driver.state.lock;
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;
@@ -28,7 +29,7 @@ import java.sql.Connection;
public final class LockDriverState implements DriverState {
@Override
- public Connection getConnection(final String databaseName, final
ContextManager contextManager) {
+ public Connection getConnection(final String databaseName, final
ContextManager contextManager, final CachedDatabaseMetaData
cachedDatabaseMetaData) {
// 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 f2dc10227ee..8d258c5c57c 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
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.driver.state.ok;
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;
@@ -29,8 +30,8 @@ import java.sql.Connection;
public final class OKDriverState implements DriverState {
@Override
- public Connection getConnection(final String databaseName, final
ContextManager contextManager) {
- return new ShardingSphereConnection(databaseName, contextManager);
+ public Connection getConnection(final String databaseName, final
ContextManager contextManager, final CachedDatabaseMetaData
cachedDatabaseMetaData) {
+ return new ShardingSphereConnection(databaseName, contextManager,
cachedDatabaseMetaData);
}
@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 c20c7992663..f48344151ab 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
@@ -24,6 +24,7 @@ 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;
@@ -62,7 +63,7 @@ public abstract class AbstractBaseExecutorTest {
SQLExecutorExceptionHandler.setExceptionThrown(true);
executorEngine = ExecutorEngine.createExecutorEngineWithCPU();
TransactionTypeHolder.set(TransactionType.LOCAL);
- connection = new ShardingSphereConnection(DefaultDatabase.LOGIC_NAME,
mockContextManager());
+ connection = new ShardingSphereConnection(DefaultDatabase.LOGIC_NAME,
mockContextManager(), mock(CachedDatabaseMetaData.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 12ecd9c891e..e5862a57d00 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
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.driver.jdbc.adapter;
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;
@@ -81,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);
+ return new ShardingSphereConnection(DefaultDatabase.LOGIC_NAME,
contextManager, mock(CachedDatabaseMetaData.class));
}
}
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/base/AbstractShardingSphereDataSourceForEncryptTest.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/base/AbstractShardingSphereDataSourceForEncryptTest.java
index 361483e54ba..81ccc18dadb 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/base/AbstractShardingSphereDataSourceForEncryptTest.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/base/AbstractShardingSphereDataSourceForEncryptTest.java
@@ -78,11 +78,11 @@ public abstract class
AbstractShardingSphereDataSourceForEncryptTest extends Abs
}
}
- protected final Connection getEncryptConnection() {
+ protected final Connection getEncryptConnection() throws SQLException {
return queryWithPlainDataSource.getConnection();
}
- protected final ShardingSphereConnection getEncryptConnectionWithProps() {
+ protected final ShardingSphereConnection getEncryptConnectionWithProps()
throws SQLException {
return (ShardingSphereConnection)
queryWithCipherDataSource.getConnection();
}
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 f8a9d25245a..03104d1edd1 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
@@ -20,6 +20,7 @@ package org.apache.shardingsphere.driver.jdbc.core.connection;
import lombok.SneakyThrows;
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;
@@ -53,7 +54,7 @@ public final class ShardingSphereConnectionTest {
@Before
public void setUp() throws SQLException {
- connection = new ShardingSphereConnection(DefaultDatabase.LOGIC_NAME,
mockContextManager());
+ connection = new ShardingSphereConnection(DefaultDatabase.LOGIC_NAME,
mockContextManager(), mock(CachedDatabaseMetaData.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 7bb3287be60..302bb372065 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
@@ -79,7 +79,7 @@ public final class ShardingSphereDatabaseMetaDataTest {
private final Map<String, DataSource> dataSourceMap = new HashMap<>();
- private
org.apache.shardingsphere.driver.jdbc.core.datasource.metadata.ShardingSphereDatabaseMetaData
shardingSphereDatabaseMetaData;
+ private ShardingSphereDatabaseMetaData shardingSphereDatabaseMetaData;
@Before
public void setUp() throws SQLException {
@@ -87,7 +87,6 @@ public final class ShardingSphereDatabaseMetaDataTest {
when(dataSource.getConnection()).thenReturn(connection);
when(connection.getMetaData()).thenReturn(databaseMetaData);
when(resultSet.getMetaData()).thenReturn(mock(ResultSetMetaData.class));
- CachedDatabaseMetaData cachedDatabaseMetaData = new
CachedDatabaseMetaData(databaseMetaData);
when(shardingSphereConnection.getConnectionManager().getRandomPhysicalDataSourceName()).thenReturn(DATA_SOURCE_NAME);
when(shardingSphereConnection.getConnectionManager().getRandomConnection()).thenReturn(connection);
when(shardingSphereConnection.getContextManager().getMetaDataContexts()).thenReturn(metaDataContexts);
@@ -95,10 +94,11 @@ public final class ShardingSphereDatabaseMetaDataTest {
when(shardingSphereConnection.getDatabaseName()).thenReturn(DefaultDatabase.LOGIC_NAME);
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
when(metaDataContexts.getDatabaseMetaData(shardingSphereConnection.getDatabaseName())).thenReturn(database);
-
when(database.getResource().getCachedDatabaseMetaData()).thenReturn(cachedDatabaseMetaData);
+ CachedDatabaseMetaData cachedDatabaseMetaData = new
CachedDatabaseMetaData(databaseMetaData);
+
when(shardingSphereConnection.getCachedDatabaseMetaData()).thenReturn(cachedDatabaseMetaData);
ShardingRule shardingRule = mockShardingRule();
when(database.getRuleMetaData().getRules()).thenReturn(Collections.singleton(shardingRule));
- shardingSphereDatabaseMetaData = new
org.apache.shardingsphere.driver.jdbc.core.datasource.metadata.ShardingSphereDatabaseMetaData(shardingSphereConnection);
+ shardingSphereDatabaseMetaData = new
ShardingSphereDatabaseMetaData(shardingSphereConnection);
}
private ShardingRule mockShardingRule() {
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptPreparedStatementTest.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptPreparedStatementTest.java
index 1ef54fd66c8..4dcec5f9612 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptPreparedStatementTest.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptPreparedStatementTest.java
@@ -54,7 +54,7 @@ public final class EncryptPreparedStatementTest extends
AbstractShardingSphereDa
private static final String SELECT_SQL_FOR_CONTAINS_COLUMN = "SELECT *
FROM t_encrypt_contains_column WHERE plain_pwd = ?";
@Test
- public void assertSQLShow() {
+ public void assertSQLShow() throws SQLException {
assertTrue(getEncryptConnectionWithProps().getContextManager().getMetaDataContexts().getProps().<Boolean>getValue(ConfigurationPropertyKey.SQL_SHOW));
}
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptStatementTest.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptStatementTest.java
index 7c10b8cd629..99f4ae4a893 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptStatementTest.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptStatementTest.java
@@ -57,7 +57,7 @@ public final class EncryptStatementTest extends
AbstractShardingSphereDataSource
private static final String SHOW_COLUMNS_SQL = "SHOW columns FROM
t_encrypt";
@Test
- public void assertSQLShow() {
+ public void assertSQLShow() throws SQLException {
assertTrue(getEncryptConnectionWithProps().getContextManager().getMetaDataContexts().getProps().<Boolean>getValue(ConfigurationPropertyKey.SQL_SHOW));
}
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 78ddba61814..7c8d6725ecf 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
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.driver.jdbc.unsupported;
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 +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);
+ shardingSphereConnection = new
ShardingSphereConnection(DefaultDatabase.LOGIC_NAME, contextManager,
mock(CachedDatabaseMetaData.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 da4e08266ea..a67a154b26b 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
@@ -23,6 +23,7 @@ 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;
@@ -68,7 +69,7 @@ public final class DriverStateContextTest {
@Test
public void assertGetConnectionWithOkState() {
- Connection actual =
DriverStateContext.getConnection(DefaultDatabase.LOGIC_NAME, contextManager);
+ Connection actual =
DriverStateContext.getConnection(DefaultDatabase.LOGIC_NAME, contextManager,
mock(CachedDatabaseMetaData.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 3fc454d2251..e82cad90aa7 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
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.driver.state.circuit;
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;
@@ -33,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));
+ Connection actual = new
CircuitBreakDriverState().getConnection(DefaultDatabase.LOGIC_NAME,
mock(ContextManager.class, RETURNS_DEEP_STUBS),
mock(CachedDatabaseMetaData.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 816737d35f1..9d589b0f883 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
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.driver.state.fixture;
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;
@@ -25,7 +26,7 @@ import java.sql.Connection;
public final class DriverStateFixture implements DriverState {
@Override
- public Connection getConnection(final String databaseName, final
ContextManager contextManager) {
+ public Connection getConnection(final String databaseName, final
ContextManager contextManager, final CachedDatabaseMetaData
cachedDatabaseMetaData) {
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 40a259b809f..75a4d7c33b1 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
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.driver.state.ok;
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;
@@ -38,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);
+ Connection actual = new
OKDriverState().getConnection(DefaultDatabase.LOGIC_NAME, contextManager,
mock(CachedDatabaseMetaData.class));
assertThat(actual, instanceOf(ShardingSphereConnection.class));
}
}
