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 2023/04/07 10:19:30 UTC
[shardingsphere] branch master updated: Remove JDBCRepositoryProvider.dropTableSQL (#25053)
This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 778468397c9 Remove JDBCRepositoryProvider.dropTableSQL (#25053)
778468397c9 is described below
commit 778468397c9f35b024dca93018dc8aaea2db50e5
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Apr 7 18:19:22 2023 +0800
Remove JDBCRepositoryProvider.dropTableSQL (#25053)
* Remove JDBCRepositoryProvider.dropTableSQL
* Add todo
* Add todo
---
.../datasource/ShardingSphereDataSourceTest.java | 106 ++++++++++++---------
.../repository/standalone/jdbc/JDBCRepository.java | 35 ++++---
.../jdbc/props/JDBCRepositoryPropertyKey.java | 2 +-
.../jdbc/provider/JDBCRepositoryProvider.java | 7 --
.../standalone/jdbc/JDBCRepositoryTest.java | 1 -
.../fixture/JDBCRepositoryProviderFixture.java | 5 -
.../standalone/h2/H2JDBCRepositoryProvider.java | 5 -
.../jdbc/mysql/MySQLJDBCRepositoryProvider.java | 5 -
.../config/config-encrypt-query-with-cipher.yaml | 2 +-
.../config/config-encrypt-query-with-plain.yaml | 2 +-
10 files changed, 81 insertions(+), 89 deletions(-)
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 ed82bf2e4eb..dec42e30eb3 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
@@ -59,45 +59,50 @@ class ShardingSphereDataSourceTest {
}
@Test
- void assertNewConstructorWithModeConfigurationOnly() throws SQLException {
- ShardingSphereDataSource actual = new ShardingSphereDataSource(DefaultDatabase.LOGIC_NAME, null);
- ContextManager contextManager = getContextManager(actual);
- assertNotNull(contextManager.getMetaDataContexts().getMetaData().getDatabase(DefaultDatabase.LOGIC_NAME));
- assertThat(contextManager.getClusterStateContext().getCurrentState(), is(ClusterState.OK));
- assertThat(contextManager.getInstanceContext().getInstance().getState().getCurrentState(), is(InstanceState.OK));
- assertTrue(contextManager.getDataSourceMap(DefaultDatabase.LOGIC_NAME).isEmpty());
+ void assertNewConstructorWithModeConfigurationOnly() throws Exception {
+ try (ShardingSphereDataSource actual = new ShardingSphereDataSource(DefaultDatabase.LOGIC_NAME, null)) {
+ ContextManager contextManager = getContextManager(actual);
+ assertNotNull(contextManager.getMetaDataContexts().getMetaData().getDatabase(DefaultDatabase.LOGIC_NAME));
+ assertThat(contextManager.getClusterStateContext().getCurrentState(), is(ClusterState.OK));
+ assertThat(contextManager.getInstanceContext().getInstance().getState().getCurrentState(), is(InstanceState.OK));
+ assertTrue(contextManager.getDataSourceMap(DefaultDatabase.LOGIC_NAME).isEmpty());
+ }
}
@Test
- void assertNewConstructorWithAllArguments() throws SQLException {
+ void assertNewConstructorWithAllArguments() throws Exception {
Connection connection = mock(Connection.class, RETURNS_DEEP_STUBS);
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));
- assertThat(contextManager.getClusterStateContext().getCurrentState(), is(ClusterState.OK));
- assertThat(contextManager.getInstanceContext().getInstance().getState().getCurrentState(), is(InstanceState.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"));
+ try (ShardingSphereDataSource actual = createShardingSphereDataSource(new MockedDataSource(connection))) {
+ ContextManager contextManager = getContextManager(actual);
+ assertNotNull(contextManager.getMetaDataContexts().getMetaData().getDatabase(DefaultDatabase.LOGIC_NAME));
+ assertThat(contextManager.getClusterStateContext().getCurrentState(), is(ClusterState.OK));
+ assertThat(contextManager.getInstanceContext().getInstance().getState().getCurrentState(), is(InstanceState.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"));
+ }
}
@Test
- void assertRemoveGlobalRuleConfiguration() throws SQLException {
+ void assertRemoveGlobalRuleConfiguration() throws Exception {
Connection connection = mock(Connection.class, RETURNS_DEEP_STUBS);
when(connection.getMetaData().getURL()).thenReturn("jdbc:mock://127.0.0.1/foo_ds");
CacheOption cacheOption = new CacheOption(1024, 1024);
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));
+ try (
+ 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));
+ }
}
@Test
- void assertGetConnectionWithUsernameAndPassword() throws SQLException {
+ void assertGetConnectionWithUsernameAndPassword() throws Exception {
Connection connection = mock(Connection.class, RETURNS_DEEP_STUBS);
when(connection.getMetaData().getURL()).thenReturn("jdbc:mock://127.0.0.1/foo_ds");
- assertThat(((ShardingSphereConnection) createShardingSphereDataSource(
- new MockedDataSource(connection)).getConnection("", "")).getConnectionManager().getConnections("ds", 1, ConnectionMode.MEMORY_STRICTLY).get(0), is(connection));
+ try (ShardingSphereDataSource actual = createShardingSphereDataSource(new MockedDataSource(connection))) {
+ assertThat(((ShardingSphereConnection) actual.getConnection("", "")).getConnectionManager().getConnections("ds", 1, ConnectionMode.MEMORY_STRICTLY).get(0), is(connection));
+ }
}
private ShardingSphereDataSource createShardingSphereDataSource(final DataSource dataSource) throws SQLException {
@@ -105,40 +110,51 @@ class ShardingSphereDataSourceTest {
}
@Test
- void assertEmptyDataSourceMap() throws SQLException {
- ShardingSphereDataSource actual = new ShardingSphereDataSource(DefaultDatabase.LOGIC_NAME, null);
- assertTrue(getContextManager(actual).getDataSourceMap(DefaultDatabase.LOGIC_NAME).isEmpty());
- assertThat(actual.getLoginTimeout(), is(0));
+ void assertEmptyDataSourceMap() throws Exception {
+ try (ShardingSphereDataSource actual = new ShardingSphereDataSource(DefaultDatabase.LOGIC_NAME, null)) {
+ assertTrue(getContextManager(actual).getDataSourceMap(DefaultDatabase.LOGIC_NAME).isEmpty());
+ assertThat(actual.getLoginTimeout(), is(0));
+ }
+
}
@Test
- void assertNotEmptyDataSourceMap() throws SQLException {
- ShardingSphereDataSource actual = createShardingSphereDataSource(createHikariDataSource());
- assertThat(getContextManager(actual).getDataSourceMap(DefaultDatabase.LOGIC_NAME).size(), is(1));
- assertThat(actual.getLoginTimeout(), is(15));
+ void assertNotEmptyDataSourceMap() throws Exception {
+ try (ShardingSphereDataSource actual = createShardingSphereDataSource(createHikariDataSource())) {
+ assertThat(getContextManager(actual).getDataSourceMap(DefaultDatabase.LOGIC_NAME).size(), is(1));
+ assertThat(actual.getLoginTimeout(), is(15));
+ }
+
}
@Test
- void assertSetLoginTimeout() throws SQLException {
- ShardingSphereDataSource actual = createShardingSphereDataSource(createHikariDataSource());
- actual.setLoginTimeout(30);
- assertThat(actual.getLoginTimeout(), is(30));
+ void assertSetLoginTimeout() throws Exception {
+ try (ShardingSphereDataSource actual = createShardingSphereDataSource(createHikariDataSource())) {
+ actual.setLoginTimeout(30);
+ assertThat(actual.getLoginTimeout(), is(30));
+ }
+
}
@Test
void assertClose() throws Exception {
- ShardingSphereDataSource actual = createShardingSphereDataSource(createHikariDataSource());
- actual.close();
- Map<String, DataSource> dataSourceMap = getContextManager(actual).getDataSourceMap(DefaultDatabase.LOGIC_NAME);
- assertTrue(((HikariDataSource) dataSourceMap.get("ds")).isClosed());
+ try (HikariDataSource dataSource = createHikariDataSource()) {
+ ShardingSphereDataSource actual = createShardingSphereDataSource(dataSource);
+ actual.close();
+ Map<String, DataSource> dataSourceMap = getContextManager(actual).getDataSourceMap(DefaultDatabase.LOGIC_NAME);
+ assertTrue(((HikariDataSource) dataSourceMap.get("ds")).isClosed());
+ }
+
}
@Test
void assertCloseWithDataSourceNames() throws Exception {
- ShardingSphereDataSource actual = createShardingSphereDataSource(createHikariDataSource());
- actual.close(Collections.singleton("ds"));
- Map<String, DataSource> dataSourceMap = getContextManager(actual).getDataSourceMap(DefaultDatabase.LOGIC_NAME);
- assertTrue(((HikariDataSource) dataSourceMap.get("ds")).isClosed());
+ try (HikariDataSource dataSource = createHikariDataSource()) {
+ ShardingSphereDataSource actual = createShardingSphereDataSource(dataSource);
+ actual.close(Collections.singleton("ds"));
+ Map<String, DataSource> dataSourceMap = getContextManager(actual).getDataSourceMap(DefaultDatabase.LOGIC_NAME);
+ assertTrue(((HikariDataSource) dataSourceMap.get("ds")).isClosed());
+ }
}
@SneakyThrows(ReflectiveOperationException.class)
@@ -146,15 +162,15 @@ class ShardingSphereDataSourceTest {
return (ContextManager) Plugins.getMemberAccessor().get(ShardingSphereDataSource.class.getDeclaredField("contextManager"), dataSource);
}
- private DataSource createHikariDataSource() {
+ private HikariDataSource createHikariDataSource() {
HikariDataSource result = new HikariDataSource();
result.setJdbcUrl("jdbc:h2:mem:demo_ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL");
result.setUsername("root");
result.setPassword("root");
result.setMaximumPoolSize(10);
result.setMinimumIdle(2);
- result.setConnectionTimeout(15 * 1000);
- result.setIdleTimeout(40 * 1000);
+ result.setConnectionTimeout(15 * 1000L);
+ result.setIdleTimeout(40 * 1000L);
return result;
}
}
diff --git a/mode/type/standalone/repository/provider/jdbc/core/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/JDBCRepository.java b/mode/type/standalone/repository/provider/jdbc/core/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/JDBCRepository.java
index e3d4598b505..6c12bebe236 100644
--- a/mode/type/standalone/repository/provider/jdbc/core/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/JDBCRepository.java
+++ b/mode/type/standalone/repository/provider/jdbc/core/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/JDBCRepository.java
@@ -48,28 +48,27 @@ public final class JDBCRepository implements StandalonePersistRepository {
private static final String SEPARATOR = "/";
- private static final String H2_FILE_MODE_KEY = "file:";
-
private JDBCRepositoryProvider provider;
- private HikariDataSource hikariDataSource;
+ private HikariDataSource dataSource;
@SneakyThrows(SQLException.class)
@Override
public void init(final Properties props) {
JDBCRepositoryProperties jdbcRepositoryProps = new JDBCRepositoryProperties(props);
- hikariDataSource = new HikariDataSource();
- String jdbcUrl = jdbcRepositoryProps.getValue(JDBCRepositoryPropertyKey.JDBC_URL);
- hikariDataSource.setJdbcUrl(jdbcUrl);
- hikariDataSource.setUsername(jdbcRepositoryProps.getValue(JDBCRepositoryPropertyKey.USERNAME));
- hikariDataSource.setPassword(jdbcRepositoryProps.getValue(JDBCRepositoryPropertyKey.PASSWORD));
+ provider = TypedSPILoader.getService(JDBCRepositoryProvider.class, jdbcRepositoryProps.getValue(JDBCRepositoryPropertyKey.PROVIDER));
+ dataSource = new HikariDataSource();
+ dataSource.setJdbcUrl(jdbcRepositoryProps.getValue(JDBCRepositoryPropertyKey.JDBC_URL));
+ dataSource.setUsername(jdbcRepositoryProps.getValue(JDBCRepositoryPropertyKey.USERNAME));
+ dataSource.setPassword(jdbcRepositoryProps.getValue(JDBCRepositoryPropertyKey.PASSWORD));
try (
- Connection connection = hikariDataSource.getConnection();
+ Connection connection = dataSource.getConnection();
Statement statement = connection.createStatement()) {
- provider = TypedSPILoader.getService(JDBCRepositoryProvider.class, jdbcRepositoryProps.getValue(JDBCRepositoryPropertyKey.PROVIDER));
- if (!jdbcUrl.contains(H2_FILE_MODE_KEY)) {
- statement.execute(provider.dropTableSQL());
+ // TODO remove it later. Add for reset standalone test e2e's env. Need to close DataSource to release H2's memory data
+ if (jdbcRepositoryProps.<String>getValue(JDBCRepositoryPropertyKey.JDBC_URL).contains("h2:mem:")) {
+ statement.execute("DROP TABLE IF EXISTS `repository`");
}
+ // Finish TODO
statement.execute(provider.createTableSQL());
}
}
@@ -77,7 +76,7 @@ public final class JDBCRepository implements StandalonePersistRepository {
@Override
public String getDirectly(final String key) {
try (
- Connection connection = hikariDataSource.getConnection();
+ Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement(provider.selectByKeySQL())) {
preparedStatement.setString(1, key);
try (ResultSet resultSet = preparedStatement.executeQuery()) {
@@ -94,7 +93,7 @@ public final class JDBCRepository implements StandalonePersistRepository {
@Override
public List<String> getChildrenKeys(final String key) {
try (
- Connection connection = hikariDataSource.getConnection();
+ Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement(provider.selectByParentKeySQL())) {
preparedStatement.setString(1, key);
try (ResultSet resultSet = preparedStatement.executeQuery()) {
@@ -151,7 +150,7 @@ public final class JDBCRepository implements StandalonePersistRepository {
private void insert(final String key, final String value, final String parent) throws SQLException {
try (
- Connection connection = hikariDataSource.getConnection();
+ Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement(provider.insertSQL())) {
preparedStatement.setString(1, UUID.randomUUID().toString());
preparedStatement.setString(2, key);
@@ -164,7 +163,7 @@ public final class JDBCRepository implements StandalonePersistRepository {
@Override
public void update(final String key, final String value) {
try (
- Connection connection = hikariDataSource.getConnection();
+ Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement(provider.updateSQL())) {
preparedStatement.setString(1, value);
preparedStatement.setString(2, key);
@@ -177,7 +176,7 @@ public final class JDBCRepository implements StandalonePersistRepository {
@Override
public void delete(final String key) {
try (
- Connection connection = hikariDataSource.getConnection();
+ Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement(provider.deleteSQL())) {
preparedStatement.setString(1, key);
preparedStatement.executeUpdate();
@@ -188,7 +187,7 @@ public final class JDBCRepository implements StandalonePersistRepository {
@Override
public void close() {
- hikariDataSource.close();
+ dataSource.close();
}
@Override
diff --git a/mode/type/standalone/repository/provider/jdbc/core/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/props/JDBCRepositoryPropertyKey.java b/mode/type/standalone/repository/provider/jdbc/core/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/props/JDBCRepositoryPropertyKey.java
index 7135f7524ab..7361a038625 100644
--- a/mode/type/standalone/repository/provider/jdbc/core/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/props/JDBCRepositoryPropertyKey.java
+++ b/mode/type/standalone/repository/provider/jdbc/core/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/props/JDBCRepositoryPropertyKey.java
@@ -30,7 +30,7 @@ public enum JDBCRepositoryPropertyKey implements TypedPropertyKey {
PROVIDER("provider", "H2", String.class),
- JDBC_URL("jdbc_url", "jdbc:h2:mem:config;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL", String.class),
+ JDBC_URL("jdbc_url", "jdbc:h2:mem:config;DB_CLOSE_DELAY=0;DATABASE_TO_UPPER=false;MODE=MYSQL", String.class),
USERNAME("username", "sa", String.class),
diff --git a/mode/type/standalone/repository/provider/jdbc/core/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/provider/JDBCRepositoryProvider.java b/mode/type/standalone/repository/provider/jdbc/core/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/provider/JDBCRepositoryProvider.java
index de68e347084..9d4c2c2b80a 100644
--- a/mode/type/standalone/repository/provider/jdbc/core/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/provider/JDBCRepositoryProvider.java
+++ b/mode/type/standalone/repository/provider/jdbc/core/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/provider/JDBCRepositoryProvider.java
@@ -26,13 +26,6 @@ import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPI;
@SingletonSPI
public interface JDBCRepositoryProvider extends TypedSPI {
- /**
- * Drop table SQL.
- *
- * @return SQL to drop table
- */
- String dropTableSQL();
-
/**
* Create table SQL.
*
diff --git a/mode/type/standalone/repository/provider/jdbc/core/src/test/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/JDBCRepositoryTest.java b/mode/type/standalone/repository/provider/jdbc/core/src/test/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/JDBCRepositoryTest.java
index 0460d93cf7e..987bd46c5ed 100644
--- a/mode/type/standalone/repository/provider/jdbc/core/src/test/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/JDBCRepositoryTest.java
+++ b/mode/type/standalone/repository/provider/jdbc/core/src/test/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/JDBCRepositoryTest.java
@@ -90,7 +90,6 @@ class JDBCRepositoryTest {
@Test
void assertInit() throws Exception {
- verify(mockStatement).execute(fixture.dropTableSQL());
verify(mockStatement).execute(fixture.createTableSQL());
}
diff --git a/mode/type/standalone/repository/provider/jdbc/core/src/test/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/fixture/JDBCRepositoryProviderFixture.java b/mode/type/standalone/repository/provider/jdbc/core/src/test/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/fixture/JDBCRepositoryProviderFixture.java
index 1c13a55cda6..14f9496a5e0 100644
--- a/mode/type/standalone/repository/provider/jdbc/core/src/test/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/fixture/JDBCRepositoryProviderFixture.java
+++ b/mode/type/standalone/repository/provider/jdbc/core/src/test/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/fixture/JDBCRepositoryProviderFixture.java
@@ -21,11 +21,6 @@ import org.apache.shardingsphere.mode.repository.standalone.jdbc.provider.JDBCRe
public final class JDBCRepositoryProviderFixture implements JDBCRepositoryProvider {
- @Override
- public String dropTableSQL() {
- return "DROP TABLE IF EXISTS `repository`";
- }
-
@Override
public String createTableSQL() {
return "CREATE TABLE IF NOT EXISTS `repository`(id varchar(36) PRIMARY KEY, `key` TEXT, `value` TEXT, parent TEXT)";
diff --git a/mode/type/standalone/repository/provider/jdbc/h2/src/main/java/org/apache/shardingsphere/mode/repository/standalone/h2/H2JDBCRepositoryProvider.java b/mode/type/standalone/repository/provider/jdbc/h2/src/main/java/org/apache/shardingsphere/mode/repository/standalone/h2/H2JDBCRepositoryProvider.java
index 6c022c2dbdd..cf9ed902e05 100644
--- a/mode/type/standalone/repository/provider/jdbc/h2/src/main/java/org/apache/shardingsphere/mode/repository/standalone/h2/H2JDBCRepositoryProvider.java
+++ b/mode/type/standalone/repository/provider/jdbc/h2/src/main/java/org/apache/shardingsphere/mode/repository/standalone/h2/H2JDBCRepositoryProvider.java
@@ -24,11 +24,6 @@ import org.apache.shardingsphere.mode.repository.standalone.jdbc.provider.JDBCRe
*/
public final class H2JDBCRepositoryProvider implements JDBCRepositoryProvider {
- @Override
- public String dropTableSQL() {
- return "DROP TABLE IF EXISTS `repository`";
- }
-
@Override
public String createTableSQL() {
return "CREATE TABLE IF NOT EXISTS `repository`(id varchar(36) PRIMARY KEY, `key` TEXT, `value` TEXT, parent TEXT)";
diff --git a/mode/type/standalone/repository/provider/jdbc/mysql/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/mysql/MySQLJDBCRepositoryProvider.java b/mode/type/standalone/repository/provider/jdbc/mysql/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/mysql/MySQLJDBCRepositoryProvider.java
index 22f6edf1c2f..297667db9af 100644
--- a/mode/type/standalone/repository/provider/jdbc/mysql/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/mysql/MySQLJDBCRepositoryProvider.java
+++ b/mode/type/standalone/repository/provider/jdbc/mysql/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/mysql/MySQLJDBCRepositoryProvider.java
@@ -24,11 +24,6 @@ import org.apache.shardingsphere.mode.repository.standalone.jdbc.provider.JDBCRe
*/
public final class MySQLJDBCRepositoryProvider implements JDBCRepositoryProvider {
- @Override
- public String dropTableSQL() {
- return "DROP TABLE IF EXISTS `repository`";
- }
-
@Override
public String createTableSQL() {
return "CREATE TABLE IF NOT EXISTS `repository`(id varchar(36) PRIMARY KEY, `key` TEXT, `value` TEXT, parent TEXT)";
diff --git a/test/e2e/driver/src/test/resources/config/config-encrypt-query-with-cipher.yaml b/test/e2e/driver/src/test/resources/config/config-encrypt-query-with-cipher.yaml
index ad3d5453c56..fe61185becb 100644
--- a/test/e2e/driver/src/test/resources/config/config-encrypt-query-with-cipher.yaml
+++ b/test/e2e/driver/src/test/resources/config/config-encrypt-query-with-cipher.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-databaseName: logic_db
+databaseName: logic_db_cipher
rules:
- !ENCRYPT
diff --git a/test/e2e/driver/src/test/resources/config/config-encrypt-query-with-plain.yaml b/test/e2e/driver/src/test/resources/config/config-encrypt-query-with-plain.yaml
index 2833d05ca09..f1086c029d6 100644
--- a/test/e2e/driver/src/test/resources/config/config-encrypt-query-with-plain.yaml
+++ b/test/e2e/driver/src/test/resources/config/config-encrypt-query-with-plain.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-databaseName: logic_db
+databaseName: logic_db_plain
rules:
- !ENCRYPT