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 52cd438 Rename DataSourceMetaData.getDefaultJdbcUrlProperties() to
getDefaultQueryProperties() (#14653)
52cd438 is described below
commit 52cd438866ff4aadf624e7927eb490a70903c724
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Jan 10 13:19:44 2022 +0800
Rename DataSourceMetaData.getDefaultJdbcUrlProperties() to
getDefaultQueryProperties() (#14653)
---
.../pool/creator/DataSourceReflection.java | 2 +-
.../database/metadata/DataSourceMetaData.java | 6 ++--
.../metadata/dialect/H2DataSourceMetaData.java | 2 +-
.../dialect/MariaDBDataSourceMetaData.java | 34 +++++++++++-----------
.../metadata/dialect/MySQLDataSourceMetaData.java | 34 +++++++++++-----------
.../dialect/OpenGaussDataSourceMetaData.java | 2 +-
.../metadata/dialect/OracleDataSourceMetaData.java | 2 +-
.../dialect/PostgreSQLDataSourceMetaData.java | 2 +-
.../metadata/dialect/SQL92DataSourceMetaData.java | 2 +-
.../dialect/SQLServerDataSourceMetaData.java | 2 +-
10 files changed, 44 insertions(+), 44 deletions(-)
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 66c1293..fc76f98 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
@@ -164,7 +164,7 @@ public final class DataSourceReflection {
String jdbcUrl = getJdbcUrl(jdbcUrlFieldName);
DataSourceMetaData dataSourceMetaData =
DatabaseTypeRegistry.getDatabaseTypeByURL(jdbcUrl).getDataSourceMetaData(jdbcUrl,
null);
Properties queryProps = dataSourceMetaData.getQueryProperties();
- for (Entry<Object, Object> entry :
dataSourceMetaData.getDefaultJdbcUrlProperties().entrySet()) {
+ for (Entry<Object, Object> entry :
dataSourceMetaData.getDefaultQueryProperties().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/database/metadata/DataSourceMetaData.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/DataSourceMetaData.java
index d8d5d52..7503f63 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,11 +60,11 @@ public interface DataSourceMetaData {
Properties getQueryProperties();
/**
- * Get default JDBC URL properties.
+ * Get default query properties.
*
- * @return default JDBC URL properties
+ * @return default query properties
*/
- Properties getDefaultJdbcUrlProperties();
+ Properties getDefaultQueryProperties();
/**
* Judge whether two of data sources are in the same database instance.
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 edb9dec..ed92738 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,7 +90,7 @@ public final class H2DataSourceMetaData implements
DataSourceMetaData {
}
@Override
- public Properties getDefaultJdbcUrlProperties() {
+ public Properties getDefaultQueryProperties() {
return new Properties();
}
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 209a805..9625b6f 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,7 +42,7 @@ public final class MariaDBDataSourceMetaData implements
DataSourceMetaData {
private final Properties queryProperties;
- private final Properties defaultJdbcUrlProperties = new Properties();
+ private final Properties defaultQueryProperties = new Properties();
public MariaDBDataSourceMetaData(final String url) {
JdbcUrl jdbcUrl = new StandardJdbcUrlParser().parse(url);
@@ -51,23 +51,23 @@ public final class MariaDBDataSourceMetaData implements
DataSourceMetaData {
catalog = jdbcUrl.getDatabase();
schema = null;
queryProperties = jdbcUrl.getQueryProperties();
- buildDefaultJdbcUrlProperties();
+ buildDefaultQueryProperties();
}
- 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");
+ private void buildDefaultQueryProperties() {
+ defaultQueryProperties.setProperty("useServerPrepStmts",
Boolean.TRUE.toString());
+ defaultQueryProperties.setProperty("cachePrepStmts",
Boolean.TRUE.toString());
+ defaultQueryProperties.setProperty("prepStmtCacheSize", "200000");
+ defaultQueryProperties.setProperty("prepStmtCacheSqlLimit", "2048");
+ defaultQueryProperties.setProperty("useLocalSessionState",
Boolean.TRUE.toString());
+ defaultQueryProperties.setProperty("rewriteBatchedStatements",
Boolean.TRUE.toString());
+ defaultQueryProperties.setProperty("cacheResultSetMetadata",
Boolean.FALSE.toString());
+ defaultQueryProperties.setProperty("cacheServerConfiguration",
Boolean.TRUE.toString());
+ defaultQueryProperties.setProperty("elideSetAutoCommits",
Boolean.TRUE.toString());
+ defaultQueryProperties.setProperty("maintainTimeStats",
Boolean.FALSE.toString());
+ defaultQueryProperties.setProperty("netTimeoutForStreamingResults",
"0");
+ defaultQueryProperties.setProperty("tinyInt1isBit",
Boolean.FALSE.toString());
+ defaultQueryProperties.setProperty("useSSL", Boolean.FALSE.toString());
+ defaultQueryProperties.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 8c131ec..33f6d52 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,7 +42,7 @@ public final class MySQLDataSourceMetaData implements
DataSourceMetaData {
private final Properties queryProperties;
- private final Properties defaultJdbcUrlProperties = new Properties();
+ private final Properties defaultQueryProperties = new Properties();
public MySQLDataSourceMetaData(final String url) {
JdbcUrl jdbcUrl = new StandardJdbcUrlParser().parse(url);
@@ -51,23 +51,23 @@ public final class MySQLDataSourceMetaData implements
DataSourceMetaData {
catalog = jdbcUrl.getDatabase();
schema = null;
queryProperties = jdbcUrl.getQueryProperties();
- buildDefaultJdbcUrlProperties();
+ buildDefaultQueryProperties();
}
- 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");
+ private void buildDefaultQueryProperties() {
+ defaultQueryProperties.setProperty("useServerPrepStmts",
Boolean.TRUE.toString());
+ defaultQueryProperties.setProperty("cachePrepStmts",
Boolean.TRUE.toString());
+ defaultQueryProperties.setProperty("prepStmtCacheSize", "200000");
+ defaultQueryProperties.setProperty("prepStmtCacheSqlLimit", "2048");
+ defaultQueryProperties.setProperty("useLocalSessionState",
Boolean.TRUE.toString());
+ defaultQueryProperties.setProperty("rewriteBatchedStatements",
Boolean.TRUE.toString());
+ defaultQueryProperties.setProperty("cacheResultSetMetadata",
Boolean.FALSE.toString());
+ defaultQueryProperties.setProperty("cacheServerConfiguration",
Boolean.TRUE.toString());
+ defaultQueryProperties.setProperty("elideSetAutoCommits",
Boolean.TRUE.toString());
+ defaultQueryProperties.setProperty("maintainTimeStats",
Boolean.FALSE.toString());
+ defaultQueryProperties.setProperty("netTimeoutForStreamingResults",
"0");
+ defaultQueryProperties.setProperty("tinyInt1isBit",
Boolean.FALSE.toString());
+ defaultQueryProperties.setProperty("useSSL", Boolean.FALSE.toString());
+ defaultQueryProperties.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 d0f6d34..8192f7d 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
@@ -52,7 +52,7 @@ public final class OpenGaussDataSourceMetaData implements
DataSourceMetaData {
}
@Override
- public Properties getDefaultJdbcUrlProperties() {
+ public Properties getDefaultQueryProperties() {
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 b2833f9..adb214f 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
@@ -79,7 +79,7 @@ public final class OracleDataSourceMetaData implements
DataSourceMetaData {
}
@Override
- public Properties getDefaultJdbcUrlProperties() {
+ public Properties getDefaultQueryProperties() {
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 b140816..c240dc8 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
@@ -52,7 +52,7 @@ public final class PostgreSQLDataSourceMetaData implements
DataSourceMetaData {
}
@Override
- public Properties getDefaultJdbcUrlProperties() {
+ public Properties getDefaultQueryProperties() {
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 e2496b7..69fd2be 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
@@ -60,7 +60,7 @@ public final class SQL92DataSourceMetaData implements
DataSourceMetaData {
}
@Override
- public Properties getDefaultJdbcUrlProperties() {
+ public Properties getDefaultQueryProperties() {
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 9e7ec8d..bd87049 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
@@ -61,7 +61,7 @@ public final class SQLServerDataSourceMetaData implements
DataSourceMetaData {
}
@Override
- public Properties getDefaultJdbcUrlProperties() {
+ public Properties getDefaultQueryProperties() {
return new Properties();
}
}
