You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2022/01/10 04:56:52 UTC
[shardingsphere] branch master updated: Use DataSourceMetaData URL's default jdbc url properties to instead of DataSourcePoolCreationMetaData one (#14651)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 d68f090 Use DataSourceMetaData URL's default jdbc url properties to instead of DataSourcePoolCreationMetaData one (#14651)
d68f090 is described below
commit d68f0908593e553b1735c67e609cbfc2eac25927
Author: Liang Zhang <te...@163.com>
AuthorDate: Mon Jan 10 12:56:06 2022 +0800
Use DataSourceMetaData URL's default jdbc url properties to instead of DataSourcePoolCreationMetaData one (#14651)
---
.../creator/DataSourcePoolCreationMetaData.java | 8 --------
.../pool/creator/DataSourcePoolCreator.java | 3 +--
.../pool/creator/DataSourceReflection.java | 11 +++++------
.../impl/DefaultDataSourcePoolCreationMetaData.java | 6 ------
.../impl/HikariDataSourcePoolCreationMetaData.java | 21 ---------------------
.../infra/database/metadata/DataSourceMetaData.java | 7 +++++++
.../metadata/dialect/H2DataSourceMetaData.java | 5 +++++
.../metadata/dialect/MariaDBDataSourceMetaData.java | 20 ++++++++++++++++++++
.../metadata/dialect/MySQLDataSourceMetaData.java | 20 ++++++++++++++++++++
.../dialect/OpenGaussDataSourceMetaData.java | 5 +++++
.../metadata/dialect/OracleDataSourceMetaData.java | 5 +++++
.../dialect/PostgreSQLDataSourceMetaData.java | 5 +++++
.../metadata/dialect/SQL92DataSourceMetaData.java | 5 +++++
.../dialect/SQLServerDataSourceMetaData.java | 5 +++++
.../impl/HikariDataSourcePoolCreatorTest.java | 8 ++++----
15 files changed, 87 insertions(+), 47 deletions(-)
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreationMetaData.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreationMetaData.java
index c7b1cca..dde8950 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreationMetaData.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreationMetaData.java
@@ -21,7 +21,6 @@ import org.apache.shardingsphere.spi.required.RequiredSPI;
import org.apache.shardingsphere.spi.typed.TypedSPI;
import java.util.Map;
-import java.util.Properties;
/**
* Data source pool creation meta data.
@@ -62,11 +61,4 @@ public interface DataSourcePoolCreationMetaData extends TypedSPI, RequiredSPI {
* @return JDBC URL properties field name
*/
String getJdbcUrlPropertiesFieldName();
-
- /**
- * Get default JDBC URL properties.
- *
- * @return default JDBC URL properties
- */
- Properties getDefaultJdbcUrlProperties();
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreator.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreator.java
index 2171281..bbb7ba6 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreator.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreator.java
@@ -80,8 +80,7 @@ public final class DataSourcePoolCreator {
DataSourceReflection dataSourceReflection = new DataSourceReflection(result);
setDefaultFields(dataSourceReflection);
setConfiguredFields(dataSourceConfig, dataSourceReflection);
- dataSourceReflection.addDefaultDataSourceProperties(
- creationMetaData.getJdbcUrlPropertiesFieldName(), creationMetaData.getJdbcUrlFieldName(), creationMetaData.getDefaultJdbcUrlProperties());
+ dataSourceReflection.addDefaultDataSourceProperties(creationMetaData.getJdbcUrlPropertiesFieldName(), creationMetaData.getJdbcUrlFieldName());
return result;
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourceReflection.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourceReflection.java
index 5c82aaa..66c1293 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourceReflection.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourceReflection.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.infra.config.datasource.pool.creator;
import com.google.common.base.CaseFormat;
import com.google.common.collect.Sets;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.infra.database.type.DatabaseType;
+import org.apache.shardingsphere.infra.database.metadata.DataSourceMetaData;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import javax.sql.DataSource;
@@ -155,17 +155,16 @@ public final class DataSourceReflection {
*
* @param dataSourcePropsFieldName data source properties field name
* @param jdbcUrlFieldName JDBC URL field name
- * @param defaultDataSourceProps default data source properties
*/
- public void addDefaultDataSourceProperties(final String dataSourcePropsFieldName, final String jdbcUrlFieldName, final Properties defaultDataSourceProps) {
+ public void addDefaultDataSourceProperties(final String dataSourcePropsFieldName, final String jdbcUrlFieldName) {
if (null == dataSourcePropsFieldName || null == jdbcUrlFieldName) {
return;
}
Properties targetDataSourceProps = getDataSourcePropertiesFieldName(dataSourcePropsFieldName);
String jdbcUrl = getJdbcUrl(jdbcUrlFieldName);
- DatabaseType databaseType = DatabaseTypeRegistry.getDatabaseTypeByURL(jdbcUrl);
- Properties queryProps = databaseType.getDataSourceMetaData(jdbcUrl, null).getQueryProperties();
- for (Entry<Object, Object> entry : defaultDataSourceProps.entrySet()) {
+ DataSourceMetaData dataSourceMetaData = DatabaseTypeRegistry.getDatabaseTypeByURL(jdbcUrl).getDataSourceMetaData(jdbcUrl, null);
+ Properties queryProps = dataSourceMetaData.getQueryProperties();
+ for (Entry<Object, Object> entry : dataSourceMetaData.getDefaultJdbcUrlProperties().entrySet()) {
String defaultPropertyKey = entry.getKey().toString();
String defaultPropertyValue = entry.getValue().toString();
if (!containsDefaultProperty(defaultPropertyKey, targetDataSourceProps, queryProps)) {
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/DefaultDataSourcePoolCreationMetaData.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/DefaultDataSourcePoolCreationMetaData.java
index 34c01e8..cfd6fcf 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/DefaultDataSourcePoolCreationMetaData.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/DefaultDataSourcePoolCreationMetaData.java
@@ -21,7 +21,6 @@ import org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSource
import java.util.Collections;
import java.util.Map;
-import java.util.Properties;
/**
* Default data source pool creator.
@@ -54,11 +53,6 @@ public final class DefaultDataSourcePoolCreationMetaData implements DataSourcePo
}
@Override
- public Properties getDefaultJdbcUrlProperties() {
- return new Properties();
- }
-
- @Override
public String getType() {
return "Default";
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/HikariDataSourcePoolCreationMetaData.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/HikariDataSourcePoolCreationMetaData.java
index fc90eb9..6d5903c 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/HikariDataSourcePoolCreationMetaData.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/HikariDataSourcePoolCreationMetaData.java
@@ -23,7 +23,6 @@ import org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSource
import java.util.HashMap;
import java.util.Map;
-import java.util.Properties;
/**
* Hikari data source pool creator.
@@ -37,13 +36,10 @@ public final class HikariDataSourcePoolCreationMetaData implements DataSourcePoo
private final Map<String, String> propertySynonyms = new HashMap<>(2, 1);
- private final Properties defaultJdbcUrlProperties = new Properties();
-
public HikariDataSourcePoolCreationMetaData() {
buildDefaultProperties();
buildInvalidProperties();
buildPropertySynonyms();
- buildDefaultJdbcUrlProperties();
}
private void buildDefaultProperties() {
@@ -65,23 +61,6 @@ public final class HikariDataSourcePoolCreationMetaData implements DataSourcePoo
propertySynonyms.put("minPoolSize", "minimumIdle");
}
- private void buildDefaultJdbcUrlProperties() {
- defaultJdbcUrlProperties.setProperty("useServerPrepStmts", Boolean.TRUE.toString());
- defaultJdbcUrlProperties.setProperty("cachePrepStmts", Boolean.TRUE.toString());
- defaultJdbcUrlProperties.setProperty("prepStmtCacheSize", "200000");
- defaultJdbcUrlProperties.setProperty("prepStmtCacheSqlLimit", "2048");
- defaultJdbcUrlProperties.setProperty("useLocalSessionState", Boolean.TRUE.toString());
- defaultJdbcUrlProperties.setProperty("rewriteBatchedStatements", Boolean.TRUE.toString());
- defaultJdbcUrlProperties.setProperty("cacheResultSetMetadata", Boolean.FALSE.toString());
- defaultJdbcUrlProperties.setProperty("cacheServerConfiguration", Boolean.TRUE.toString());
- defaultJdbcUrlProperties.setProperty("elideSetAutoCommits", Boolean.TRUE.toString());
- defaultJdbcUrlProperties.setProperty("maintainTimeStats", Boolean.FALSE.toString());
- defaultJdbcUrlProperties.setProperty("netTimeoutForStreamingResults", "0");
- defaultJdbcUrlProperties.setProperty("tinyInt1isBit", Boolean.FALSE.toString());
- defaultJdbcUrlProperties.setProperty("useSSL", Boolean.FALSE.toString());
- defaultJdbcUrlProperties.setProperty("serverTimezone", "UTC");
- }
-
@Override
public String getJdbcUrlFieldName() {
return "jdbcUrl";
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/DataSourceMetaData.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/DataSourceMetaData.java
index b7a83e0..d8d5d52 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/DataSourceMetaData.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/DataSourceMetaData.java
@@ -60,6 +60,13 @@ public interface DataSourceMetaData {
Properties getQueryProperties();
/**
+ * Get default JDBC URL properties.
+ *
+ * @return default JDBC URL properties
+ */
+ Properties getDefaultJdbcUrlProperties();
+
+ /**
* Judge whether two of data sources are in the same database instance.
*
* @param dataSourceMetaData data source meta data
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/H2DataSourceMetaData.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/H2DataSourceMetaData.java
index eff92a3..edb9dec 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/H2DataSourceMetaData.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/H2DataSourceMetaData.java
@@ -90,6 +90,11 @@ public final class H2DataSourceMetaData implements DataSourceMetaData {
}
@Override
+ public Properties getDefaultJdbcUrlProperties() {
+ return new Properties();
+ }
+
+ @Override
public boolean isInSameDatabaseInstance(final DataSourceMetaData dataSourceMetaData) {
if (!(dataSourceMetaData instanceof H2DataSourceMetaData)) {
return false;
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/MariaDBDataSourceMetaData.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/MariaDBDataSourceMetaData.java
index 4ec8d26..209a805 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/MariaDBDataSourceMetaData.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/MariaDBDataSourceMetaData.java
@@ -42,6 +42,8 @@ public final class MariaDBDataSourceMetaData implements DataSourceMetaData {
private final Properties queryProperties;
+ private final Properties defaultJdbcUrlProperties = new Properties();
+
public MariaDBDataSourceMetaData(final String url) {
JdbcUrl jdbcUrl = new StandardJdbcUrlParser().parse(url);
hostname = jdbcUrl.getHostname();
@@ -49,5 +51,23 @@ public final class MariaDBDataSourceMetaData implements DataSourceMetaData {
catalog = jdbcUrl.getDatabase();
schema = null;
queryProperties = jdbcUrl.getQueryProperties();
+ buildDefaultJdbcUrlProperties();
+ }
+
+ private void buildDefaultJdbcUrlProperties() {
+ defaultJdbcUrlProperties.setProperty("useServerPrepStmts", Boolean.TRUE.toString());
+ defaultJdbcUrlProperties.setProperty("cachePrepStmts", Boolean.TRUE.toString());
+ defaultJdbcUrlProperties.setProperty("prepStmtCacheSize", "200000");
+ defaultJdbcUrlProperties.setProperty("prepStmtCacheSqlLimit", "2048");
+ defaultJdbcUrlProperties.setProperty("useLocalSessionState", Boolean.TRUE.toString());
+ defaultJdbcUrlProperties.setProperty("rewriteBatchedStatements", Boolean.TRUE.toString());
+ defaultJdbcUrlProperties.setProperty("cacheResultSetMetadata", Boolean.FALSE.toString());
+ defaultJdbcUrlProperties.setProperty("cacheServerConfiguration", Boolean.TRUE.toString());
+ defaultJdbcUrlProperties.setProperty("elideSetAutoCommits", Boolean.TRUE.toString());
+ defaultJdbcUrlProperties.setProperty("maintainTimeStats", Boolean.FALSE.toString());
+ defaultJdbcUrlProperties.setProperty("netTimeoutForStreamingResults", "0");
+ defaultJdbcUrlProperties.setProperty("tinyInt1isBit", Boolean.FALSE.toString());
+ defaultJdbcUrlProperties.setProperty("useSSL", Boolean.FALSE.toString());
+ defaultJdbcUrlProperties.setProperty("serverTimezone", "UTC");
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/MySQLDataSourceMetaData.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/MySQLDataSourceMetaData.java
index 9827faa..8c131ec 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/MySQLDataSourceMetaData.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/MySQLDataSourceMetaData.java
@@ -42,6 +42,8 @@ public final class MySQLDataSourceMetaData implements DataSourceMetaData {
private final Properties queryProperties;
+ private final Properties defaultJdbcUrlProperties = new Properties();
+
public MySQLDataSourceMetaData(final String url) {
JdbcUrl jdbcUrl = new StandardJdbcUrlParser().parse(url);
hostname = jdbcUrl.getHostname();
@@ -49,5 +51,23 @@ public final class MySQLDataSourceMetaData implements DataSourceMetaData {
catalog = jdbcUrl.getDatabase();
schema = null;
queryProperties = jdbcUrl.getQueryProperties();
+ buildDefaultJdbcUrlProperties();
+ }
+
+ private void buildDefaultJdbcUrlProperties() {
+ defaultJdbcUrlProperties.setProperty("useServerPrepStmts", Boolean.TRUE.toString());
+ defaultJdbcUrlProperties.setProperty("cachePrepStmts", Boolean.TRUE.toString());
+ defaultJdbcUrlProperties.setProperty("prepStmtCacheSize", "200000");
+ defaultJdbcUrlProperties.setProperty("prepStmtCacheSqlLimit", "2048");
+ defaultJdbcUrlProperties.setProperty("useLocalSessionState", Boolean.TRUE.toString());
+ defaultJdbcUrlProperties.setProperty("rewriteBatchedStatements", Boolean.TRUE.toString());
+ defaultJdbcUrlProperties.setProperty("cacheResultSetMetadata", Boolean.FALSE.toString());
+ defaultJdbcUrlProperties.setProperty("cacheServerConfiguration", Boolean.TRUE.toString());
+ defaultJdbcUrlProperties.setProperty("elideSetAutoCommits", Boolean.TRUE.toString());
+ defaultJdbcUrlProperties.setProperty("maintainTimeStats", Boolean.FALSE.toString());
+ defaultJdbcUrlProperties.setProperty("netTimeoutForStreamingResults", "0");
+ defaultJdbcUrlProperties.setProperty("tinyInt1isBit", Boolean.FALSE.toString());
+ defaultJdbcUrlProperties.setProperty("useSSL", Boolean.FALSE.toString());
+ defaultJdbcUrlProperties.setProperty("serverTimezone", "UTC");
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/OpenGaussDataSourceMetaData.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/OpenGaussDataSourceMetaData.java
index 1a65306..d0f6d34 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/OpenGaussDataSourceMetaData.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/OpenGaussDataSourceMetaData.java
@@ -50,4 +50,9 @@ public final class OpenGaussDataSourceMetaData implements DataSourceMetaData {
schema = null;
queryProperties = jdbcUrl.getQueryProperties();
}
+
+ @Override
+ public Properties getDefaultJdbcUrlProperties() {
+ return new Properties();
+ }
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/OracleDataSourceMetaData.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/OracleDataSourceMetaData.java
index 78e496a..b2833f9 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/OracleDataSourceMetaData.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/OracleDataSourceMetaData.java
@@ -77,4 +77,9 @@ public final class OracleDataSourceMetaData implements DataSourceMetaData {
public Properties getQueryProperties() {
return new Properties();
}
+
+ @Override
+ public Properties getDefaultJdbcUrlProperties() {
+ return new Properties();
+ }
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/PostgreSQLDataSourceMetaData.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/PostgreSQLDataSourceMetaData.java
index 91f5f1b..b140816 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/PostgreSQLDataSourceMetaData.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/PostgreSQLDataSourceMetaData.java
@@ -50,4 +50,9 @@ public final class PostgreSQLDataSourceMetaData implements DataSourceMetaData {
schema = null;
queryProperties = jdbcUrl.getQueryProperties();
}
+
+ @Override
+ public Properties getDefaultJdbcUrlProperties() {
+ return new Properties();
+ }
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/SQL92DataSourceMetaData.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/SQL92DataSourceMetaData.java
index 8f65ca2..e2496b7 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/SQL92DataSourceMetaData.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/SQL92DataSourceMetaData.java
@@ -58,4 +58,9 @@ public final class SQL92DataSourceMetaData implements DataSourceMetaData {
public Properties getQueryProperties() {
return new Properties();
}
+
+ @Override
+ public Properties getDefaultJdbcUrlProperties() {
+ return new Properties();
+ }
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/SQLServerDataSourceMetaData.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/SQLServerDataSourceMetaData.java
index ba99f0c..9e7ec8d 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/SQLServerDataSourceMetaData.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/SQLServerDataSourceMetaData.java
@@ -59,4 +59,9 @@ public final class SQLServerDataSourceMetaData implements DataSourceMetaData {
public Properties getQueryProperties() {
return new Properties();
}
+
+ @Override
+ public Properties getDefaultJdbcUrlProperties() {
+ return new Properties();
+ }
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/HikariDataSourcePoolCreatorTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/HikariDataSourcePoolCreatorTest.java
index 6d01be9..2137329 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/HikariDataSourcePoolCreatorTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/HikariDataSourcePoolCreatorTest.java
@@ -38,7 +38,7 @@ public final class HikariDataSourcePoolCreatorTest {
@Test
public void assertCreateDataSourceConfigurationWithoutDriverClassName() {
HikariDataSource dataSource = new HikariDataSource();
- dataSource.setJdbcUrl("jdbc:mock://127.0.0.1/foo_ds");
+ dataSource.setJdbcUrl("jdbc:mysql://127.0.0.1/foo_ds");
dataSource.setUsername("root");
dataSource.setPassword("root");
DataSourceConfiguration dataSourceConfiguration = new DataSourcePoolCreator(HikariDataSource.class.getCanonicalName()).createDataSourceConfiguration(dataSource);
@@ -51,7 +51,7 @@ public final class HikariDataSourcePoolCreatorTest {
DataSourcePoolCreator dataSourcePoolCreator = new DataSourcePoolCreator(HikariDataSource.class.getCanonicalName());
DataSourceConfiguration configuration = dataSourcePoolCreator.createDataSourceConfiguration(dataSourcePoolCreator.createDataSource(createDataSourceConfiguration()));
assertThat(configuration.getDataSourceClassName(), is("com.zaxxer.hikari.HikariDataSource"));
- assertThat(configuration.getProps().get("jdbcUrl"), is("jdbc:mock://127.0.0.1/foo_ds"));
+ assertThat(configuration.getProps().get("jdbcUrl"), is("jdbc:mysql://127.0.0.1/foo_ds"));
assertThat(configuration.getProps().get("driverClassName"), is(MockedDataSource.class.getCanonicalName()));
assertThat(configuration.getProps().get("username"), is("root"));
assertThat(configuration.getProps().get("password"), is("root"));
@@ -66,7 +66,7 @@ public final class HikariDataSourcePoolCreatorTest {
DataSource dataSource = dataSourcePoolCreator.createDataSource(createDataSourceConfiguration());
assertThat(dataSource, instanceOf(HikariDataSource.class));
HikariDataSource hikariDataSource = (HikariDataSource) dataSource;
- assertThat(hikariDataSource.getJdbcUrl(), is("jdbc:mock://127.0.0.1/foo_ds"));
+ assertThat(hikariDataSource.getJdbcUrl(), is("jdbc:mysql://127.0.0.1/foo_ds"));
assertThat(hikariDataSource.getDriverClassName(), is(MockedDataSource.class.getCanonicalName()));
assertThat(hikariDataSource.getUsername(), is("root"));
assertThat(hikariDataSource.getPassword(), is("root"));
@@ -77,7 +77,7 @@ public final class HikariDataSourcePoolCreatorTest {
private DataSourceConfiguration createDataSourceConfiguration() {
Map<String, Object> props = new HashMap<>(16, 1);
- props.put("jdbcUrl", "jdbc:mock://127.0.0.1/foo_ds");
+ props.put("jdbcUrl", "jdbc:mysql://127.0.0.1/foo_ds");
props.put("driverClassName", MockedDataSource.class.getCanonicalName());
props.put("username", "root");
props.put("password", "root");