This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 bcbc9adcbb5 Rename DialectDatabasePrivilegeChecker (#32587)
bcbc9adcbb5 is described below
commit bcbc9adcbb56079d51e93e9c888487a1973542a1
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Aug 18 18:19:40 2024 +0800
Rename DialectDatabasePrivilegeChecker (#32587)
---
.../validator/DataSourcePoolPropertiesValidator.java | 6 +++---
...ecker.java => DialectDatabasePrivilegeChecker.java} | 6 +++---
...entChecker.java => H2DatabasePrivilegeChecker.java} | 6 +++---
...abase.core.checker.DialectDatabasePrivilegeChecker} | 2 +-
...Checker.java => MySQLDatabasePrivilegeChecker.java} | 6 +++---
...abase.core.checker.DialectDatabasePrivilegeChecker} | 2 +-
.../checker/MySQLDatabaseEnvironmentCheckerTest.java | 18 +++++++++---------
...ker.java => OpenGaussDatabasePrivilegeChecker.java} | 6 +++---
...abase.core.checker.DialectDatabasePrivilegeChecker} | 2 +-
...er.java => PostgreSQLDatabasePrivilegeChecker.java} | 6 +++---
...abase.core.checker.DialectDatabasePrivilegeChecker} | 2 +-
.../PostgreSQLDatabaseEnvironmentCheckerTest.java | 12 ++++++------
.../core/checker/PipelineDataSourceCheckEngine.java | 10 +++++-----
.../xa/XAShardingSphereTransactionManager.java | 6 +++---
14 files changed, 45 insertions(+), 45 deletions(-)
diff --git
a/infra/data-source-pool/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/props/validator/DataSourcePoolPropertiesValidator.java
b/infra/data-source-pool/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/props/validator/DataSourcePoolPropertiesValidator.java
index c2ae0a408fc..ad50c1fbe0e 100644
---
a/infra/data-source-pool/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/props/validator/DataSourcePoolPropertiesValidator.java
+++
b/infra/data-source-pool/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/props/validator/DataSourcePoolPropertiesValidator.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.infra.datasource.pool.props.validator;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.infra.database.core.checker.DialectDatabaseEnvironmentChecker;
+import
org.apache.shardingsphere.infra.database.core.checker.DialectDatabasePrivilegeChecker;
import
org.apache.shardingsphere.infra.database.core.checker.PrivilegeCheckType;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
@@ -103,10 +103,10 @@ public final class DataSourcePoolPropertiesValidator {
private static void checkPrivileges(final DataSource dataSource, final
DataSourcePoolProperties props, final Collection<PrivilegeCheckType>
expectedPrivileges) {
DatabaseType databaseType = DatabaseTypeFactory.get((String)
props.getConnectionPropertySynonyms().getStandardProperties().get("url"));
- Optional<DialectDatabaseEnvironmentChecker> checker =
DatabaseTypedSPILoader.findService(DialectDatabaseEnvironmentChecker.class,
databaseType);
+ Optional<DialectDatabasePrivilegeChecker> checker =
DatabaseTypedSPILoader.findService(DialectDatabasePrivilegeChecker.class,
databaseType);
if (checker.isPresent()) {
for (PrivilegeCheckType each : expectedPrivileges) {
- checker.get().checkPrivilege(dataSource, each);
+ checker.get().check(dataSource, each);
}
}
}
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/checker/DialectDatabaseEnvironmentChecker.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/checker/DialectDatabasePrivilegeChecker.java
similarity index 85%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/checker/DialectDatabaseEnvironmentChecker.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/checker/DialectDatabasePrivilegeChecker.java
index 84cc9724e19..b9b37719a5d 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/checker/DialectDatabaseEnvironmentChecker.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/checker/DialectDatabasePrivilegeChecker.java
@@ -23,10 +23,10 @@ import
org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
import javax.sql.DataSource;
/**
- * Dialect database environment checker.
+ * Dialect database privilege checker.
*/
@SingletonSPI
-public interface DialectDatabaseEnvironmentChecker extends DatabaseTypedSPI {
+public interface DialectDatabasePrivilegeChecker extends DatabaseTypedSPI {
/**
* Check user privileges.
@@ -34,5 +34,5 @@ public interface DialectDatabaseEnvironmentChecker extends
DatabaseTypedSPI {
* @param dataSource data source to be checked
* @param privilegeCheckType privilege check type
*/
- void checkPrivilege(DataSource dataSource, PrivilegeCheckType
privilegeCheckType);
+ void check(DataSource dataSource, PrivilegeCheckType privilegeCheckType);
}
diff --git
a/infra/database/type/h2/src/main/java/org/apache/shardingsphere/infra/database/h2/checker/H2DatabaseEnvironmentChecker.java
b/infra/database/type/h2/src/main/java/org/apache/shardingsphere/infra/database/h2/checker/H2DatabasePrivilegeChecker.java
similarity index 83%
rename from
infra/database/type/h2/src/main/java/org/apache/shardingsphere/infra/database/h2/checker/H2DatabaseEnvironmentChecker.java
rename to
infra/database/type/h2/src/main/java/org/apache/shardingsphere/infra/database/h2/checker/H2DatabasePrivilegeChecker.java
index 7094b726745..8484211dfee 100644
---
a/infra/database/type/h2/src/main/java/org/apache/shardingsphere/infra/database/h2/checker/H2DatabaseEnvironmentChecker.java
+++
b/infra/database/type/h2/src/main/java/org/apache/shardingsphere/infra/database/h2/checker/H2DatabasePrivilegeChecker.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.infra.database.h2.checker;
-import
org.apache.shardingsphere.infra.database.core.checker.DialectDatabaseEnvironmentChecker;
+import
org.apache.shardingsphere.infra.database.core.checker.DialectDatabasePrivilegeChecker;
import
org.apache.shardingsphere.infra.database.core.checker.PrivilegeCheckType;
import javax.sql.DataSource;
@@ -25,10 +25,10 @@ import javax.sql.DataSource;
/**
* Database environment checker for H2.
*/
-public final class H2DatabaseEnvironmentChecker implements
DialectDatabaseEnvironmentChecker {
+public final class H2DatabasePrivilegeChecker implements
DialectDatabasePrivilegeChecker {
@Override
- public void checkPrivilege(final DataSource dataSource, final
PrivilegeCheckType privilegeCheckType) {
+ public void check(final DataSource dataSource, final PrivilegeCheckType
privilegeCheckType) {
}
@Override
diff --git
a/infra/database/type/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.checker.DialectDatabaseEnvironmentChecker
b/infra/database/type/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.checker.DialectDatabasePrivilegeChecker
similarity index 90%
rename from
infra/database/type/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.checker.DialectDatabaseEnvironmentChecker
rename to
infra/database/type/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.checker.DialectDatabasePrivilegeChecker
index c405f0ce24d..7438709b5eb 100644
---
a/infra/database/type/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.checker.DialectDatabaseEnvironmentChecker
+++
b/infra/database/type/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.checker.DialectDatabasePrivilegeChecker
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.database.h2.checker.H2DatabaseEnvironmentChecker
+org.apache.shardingsphere.infra.database.h2.checker.H2DatabasePrivilegeChecker
diff --git
a/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/checker/MySQLDatabaseEnvironmentChecker.java
b/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/checker/MySQLDatabasePrivilegeChecker.java
similarity index 95%
rename from
infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/checker/MySQLDatabaseEnvironmentChecker.java
rename to
infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/checker/MySQLDatabasePrivilegeChecker.java
index 358071b6a3d..61a2614637a 100644
---
a/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/checker/MySQLDatabaseEnvironmentChecker.java
+++
b/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/checker/MySQLDatabasePrivilegeChecker.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.infra.database.mysql.checker;
-import
org.apache.shardingsphere.infra.database.core.checker.DialectDatabaseEnvironmentChecker;
+import
org.apache.shardingsphere.infra.database.core.checker.DialectDatabasePrivilegeChecker;
import
org.apache.shardingsphere.infra.database.core.checker.PrivilegeCheckType;
import
org.apache.shardingsphere.infra.database.core.exception.CheckDatabaseEnvironmentFailedException;
import
org.apache.shardingsphere.infra.database.core.exception.MissingRequiredPrivilegeException;
@@ -36,7 +36,7 @@ import java.util.Map;
/**
* Database environment checker for MySQL.
*/
-public final class MySQLDatabaseEnvironmentChecker implements
DialectDatabaseEnvironmentChecker {
+public final class MySQLDatabasePrivilegeChecker implements
DialectDatabasePrivilegeChecker {
private static final String SHOW_GRANTS_SQL = "SHOW GRANTS";
@@ -57,7 +57,7 @@ public final class MySQLDatabaseEnvironmentChecker implements
DialectDatabaseEnv
}
@Override
- public void checkPrivilege(final DataSource dataSource, final
PrivilegeCheckType privilegeCheckType) {
+ public void check(final DataSource dataSource, final PrivilegeCheckType
privilegeCheckType) {
try (Connection connection = dataSource.getConnection()) {
if (PrivilegeCheckType.XA == privilegeCheckType &&
MYSQL_MAJOR_VERSION_8 != connection.getMetaData().getDatabaseMajorVersion()) {
return;
diff --git
a/infra/database/type/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.checker.DialectDatabaseEnvironmentChecker
b/infra/database/type/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.checker.DialectDatabasePrivilegeChecker
similarity index 97%
rename from
infra/database/type/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.checker.DialectDatabaseEnvironmentChecker
rename to
infra/database/type/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.checker.DialectDatabasePrivilegeChecker
index 631900c3ccc..076b8c0bd05 100644
---
a/infra/database/type/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.checker.DialectDatabaseEnvironmentChecker
+++
b/infra/database/type/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.checker.DialectDatabasePrivilegeChecker
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.database.mysql.checker.MySQLDatabaseEnvironmentChecker
+org.apache.shardingsphere.infra.database.mysql.checker.MySQLDatabasePrivilegeChecker
diff --git
a/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/checker/MySQLDatabaseEnvironmentCheckerTest.java
b/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/checker/MySQLDatabaseEnvironmentCheckerTest.java
index 2d96978e2e5..e12cd01417e 100644
---
a/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/checker/MySQLDatabaseEnvironmentCheckerTest.java
+++
b/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/checker/MySQLDatabaseEnvironmentCheckerTest.java
@@ -60,7 +60,7 @@ class MySQLDatabaseEnvironmentCheckerTest {
when(preparedStatement.executeQuery()).thenReturn(resultSet);
when(resultSet.next()).thenReturn(true);
when(resultSet.getString(1)).thenReturn("GRANT REPLICATION SLAVE,
REPLICATION CLIENT ON *.* TO '%'@'%'");
- new MySQLDatabaseEnvironmentChecker().checkPrivilege(dataSource,
PrivilegeCheckType.PIPELINE);
+ new MySQLDatabasePrivilegeChecker().check(dataSource,
PrivilegeCheckType.PIPELINE);
verify(preparedStatement).executeQuery();
}
@@ -69,21 +69,21 @@ class MySQLDatabaseEnvironmentCheckerTest {
when(preparedStatement.executeQuery()).thenReturn(resultSet);
when(resultSet.next()).thenReturn(true);
when(resultSet.getString(1)).thenReturn("GRANT ALL PRIVILEGES CLIENT
ON *.* TO '%'@'%'");
- new MySQLDatabaseEnvironmentChecker().checkPrivilege(dataSource,
PrivilegeCheckType.PIPELINE);
+ new MySQLDatabasePrivilegeChecker().check(dataSource,
PrivilegeCheckType.PIPELINE);
verify(preparedStatement).executeQuery();
}
@Test
void assertCheckPrivilegeLackPrivileges() throws SQLException {
when(preparedStatement.executeQuery()).thenReturn(resultSet);
- assertThrows(MissingRequiredPrivilegeException.class, () -> new
MySQLDatabaseEnvironmentChecker().checkPrivilege(dataSource,
PrivilegeCheckType.PIPELINE));
+ assertThrows(MissingRequiredPrivilegeException.class, () -> new
MySQLDatabasePrivilegeChecker().check(dataSource, PrivilegeCheckType.PIPELINE));
}
@Test
void assertCheckPrivilegeFailure() throws SQLException {
when(preparedStatement.executeQuery()).thenReturn(resultSet);
when(resultSet.next()).thenThrow(new SQLException(""));
- assertThrows(CheckDatabaseEnvironmentFailedException.class, () -> new
MySQLDatabaseEnvironmentChecker().checkPrivilege(dataSource,
PrivilegeCheckType.PIPELINE));
+ assertThrows(CheckDatabaseEnvironmentFailedException.class, () -> new
MySQLDatabasePrivilegeChecker().check(dataSource, PrivilegeCheckType.PIPELINE));
}
@Test
@@ -92,14 +92,14 @@ class MySQLDatabaseEnvironmentCheckerTest {
when(dataSource.getConnection().getMetaData().getDatabaseMajorVersion()).thenReturn(8);
when(resultSet.next()).thenReturn(true);
when(resultSet.getString(1)).thenReturn("GRANT XA_RECOVER_ADMIN ON *.*
TO '%'@'%'");
- new MySQLDatabaseEnvironmentChecker().checkPrivilege(dataSource,
PrivilegeCheckType.XA);
+ new MySQLDatabasePrivilegeChecker().check(dataSource,
PrivilegeCheckType.XA);
verify(preparedStatement).executeQuery();
}
@Test
void assertUnCheckXAPrivilegeInMySQL5() throws SQLException {
when(dataSource.getConnection().getMetaData().getDatabaseMajorVersion()).thenReturn(5);
- new MySQLDatabaseEnvironmentChecker().checkPrivilege(dataSource,
PrivilegeCheckType.XA);
+ new MySQLDatabasePrivilegeChecker().check(dataSource,
PrivilegeCheckType.XA);
verify(preparedStatement, times(0)).executeQuery();
}
@@ -109,7 +109,7 @@ class MySQLDatabaseEnvironmentCheckerTest {
when(dataSource.getConnection().getMetaData().getDatabaseMajorVersion()).thenReturn(8);
when(resultSet.next()).thenReturn(true);
when(resultSet.getString(1)).thenReturn("GRANT ALL PRIVILEGES ON *.*
TO '%'@'%'");
- new MySQLDatabaseEnvironmentChecker().checkPrivilege(dataSource,
PrivilegeCheckType.XA);
+ new MySQLDatabasePrivilegeChecker().check(dataSource,
PrivilegeCheckType.XA);
verify(preparedStatement).executeQuery();
}
@@ -117,7 +117,7 @@ class MySQLDatabaseEnvironmentCheckerTest {
void assertCheckXAPrivilegeLackPrivilegesInMySQL8() throws SQLException {
when(preparedStatement.executeQuery()).thenReturn(resultSet);
when(dataSource.getConnection().getMetaData().getDatabaseMajorVersion()).thenReturn(8);
- assertThrows(MissingRequiredPrivilegeException.class, () -> new
MySQLDatabaseEnvironmentChecker().checkPrivilege(dataSource,
PrivilegeCheckType.XA));
+ assertThrows(MissingRequiredPrivilegeException.class, () -> new
MySQLDatabasePrivilegeChecker().check(dataSource, PrivilegeCheckType.XA));
}
@Test
@@ -125,6 +125,6 @@ class MySQLDatabaseEnvironmentCheckerTest {
when(preparedStatement.executeQuery()).thenReturn(resultSet);
when(dataSource.getConnection().getMetaData().getDatabaseMajorVersion()).thenReturn(8);
when(resultSet.next()).thenThrow(new SQLException(""));
- assertThrows(CheckDatabaseEnvironmentFailedException.class, () -> new
MySQLDatabaseEnvironmentChecker().checkPrivilege(dataSource,
PrivilegeCheckType.XA));
+ assertThrows(CheckDatabaseEnvironmentFailedException.class, () -> new
MySQLDatabasePrivilegeChecker().check(dataSource, PrivilegeCheckType.XA));
}
}
diff --git
a/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/checker/OpenGaussDatabaseEnvironmentChecker.java
b/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/checker/OpenGaussDatabasePrivilegeChecker.java
similarity index 93%
rename from
infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/checker/OpenGaussDatabaseEnvironmentChecker.java
rename to
infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/checker/OpenGaussDatabasePrivilegeChecker.java
index a83505e20ba..2b97d086b19 100644
---
a/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/checker/OpenGaussDatabaseEnvironmentChecker.java
+++
b/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/checker/OpenGaussDatabasePrivilegeChecker.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.database.opengauss.checker;
import lombok.extern.slf4j.Slf4j;
-import
org.apache.shardingsphere.infra.database.core.checker.DialectDatabaseEnvironmentChecker;
+import
org.apache.shardingsphere.infra.database.core.checker.DialectDatabasePrivilegeChecker;
import
org.apache.shardingsphere.infra.database.core.checker.PrivilegeCheckType;
import
org.apache.shardingsphere.infra.database.core.exception.CheckDatabaseEnvironmentFailedException;
import
org.apache.shardingsphere.infra.database.core.exception.MissingRequiredPrivilegeException;
@@ -37,12 +37,12 @@ import java.util.Collections;
* Database environment checker for openGauss.
*/
@Slf4j
-public final class OpenGaussDatabaseEnvironmentChecker implements
DialectDatabaseEnvironmentChecker {
+public final class OpenGaussDatabasePrivilegeChecker implements
DialectDatabasePrivilegeChecker {
private static final String SHOW_GRANTS_SQL = "SELECT * FROM pg_roles
WHERE rolname = ?";
@Override
- public void checkPrivilege(final DataSource dataSource, final
PrivilegeCheckType privilegeCheckType) {
+ public void check(final DataSource dataSource, final PrivilegeCheckType
privilegeCheckType) {
if (PrivilegeCheckType.PIPELINE != privilegeCheckType) {
return;
}
diff --git
a/infra/database/type/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.checker.DialectDatabaseEnvironmentChecker
b/infra/database/type/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.checker.DialectDatabasePrivilegeChecker
similarity index 96%
rename from
infra/database/type/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.checker.DialectDatabaseEnvironmentChecker
rename to
infra/database/type/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.checker.DialectDatabasePrivilegeChecker
index 4412cff08c0..b7a184ae4c5 100644
---
a/infra/database/type/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.checker.DialectDatabaseEnvironmentChecker
+++
b/infra/database/type/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.checker.DialectDatabasePrivilegeChecker
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.database.opengauss.checker.OpenGaussDatabaseEnvironmentChecker
+org.apache.shardingsphere.infra.database.opengauss.checker.OpenGaussDatabasePrivilegeChecker
diff --git
a/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/checker/PostgreSQLDatabaseEnvironmentChecker.java
b/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/checker/PostgreSQLDatabasePrivilegeChecker.java
similarity index 93%
rename from
infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/checker/PostgreSQLDatabaseEnvironmentChecker.java
rename to
infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/checker/PostgreSQLDatabasePrivilegeChecker.java
index 9f72b08ed61..1f2299fcbb1 100644
---
a/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/checker/PostgreSQLDatabaseEnvironmentChecker.java
+++
b/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/checker/PostgreSQLDatabasePrivilegeChecker.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.database.postgresql.checker;
import lombok.extern.slf4j.Slf4j;
-import
org.apache.shardingsphere.infra.database.core.checker.DialectDatabaseEnvironmentChecker;
+import
org.apache.shardingsphere.infra.database.core.checker.DialectDatabasePrivilegeChecker;
import
org.apache.shardingsphere.infra.database.core.checker.PrivilegeCheckType;
import
org.apache.shardingsphere.infra.database.core.exception.CheckDatabaseEnvironmentFailedException;
import
org.apache.shardingsphere.infra.database.core.exception.MissingRequiredPrivilegeException;
@@ -37,12 +37,12 @@ import java.util.Collections;
* Database environment checker for PostgreSQL.
*/
@Slf4j
-public final class PostgreSQLDatabaseEnvironmentChecker implements
DialectDatabaseEnvironmentChecker {
+public final class PostgreSQLDatabasePrivilegeChecker implements
DialectDatabasePrivilegeChecker {
private static final String SHOW_GRANTS_SQL = "SELECT * FROM pg_roles
WHERE rolname = ?";
@Override
- public void checkPrivilege(final DataSource dataSource, final
PrivilegeCheckType privilegeCheckType) {
+ public void check(final DataSource dataSource, final PrivilegeCheckType
privilegeCheckType) {
if (PrivilegeCheckType.PIPELINE != privilegeCheckType) {
return;
}
diff --git
a/infra/database/type/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.checker.DialectDatabaseEnvironmentChecker
b/infra/database/type/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.checker.DialectDatabasePrivilegeChecker
similarity index 96%
rename from
infra/database/type/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.checker.DialectDatabaseEnvironmentChecker
rename to
infra/database/type/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.checker.DialectDatabasePrivilegeChecker
index a67dec86c20..4faa2e4480b 100644
---
a/infra/database/type/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.checker.DialectDatabaseEnvironmentChecker
+++
b/infra/database/type/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.checker.DialectDatabasePrivilegeChecker
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.database.postgresql.checker.PostgreSQLDatabaseEnvironmentChecker
+org.apache.shardingsphere.infra.database.postgresql.checker.PostgreSQLDatabasePrivilegeChecker
diff --git
a/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/checker/PostgreSQLDatabaseEnvironmentCheckerTest.java
b/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/checker/PostgreSQLDatabaseEnvironmentCheckerTest.java
index 96ba13810a5..b261fe1a139 100644
---
a/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/checker/PostgreSQLDatabaseEnvironmentCheckerTest.java
+++
b/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/checker/PostgreSQLDatabaseEnvironmentCheckerTest.java
@@ -68,28 +68,28 @@ class PostgreSQLDatabaseEnvironmentCheckerTest {
@Test
void assertCheckRolReplication() throws SQLException {
- PostgreSQLDatabaseEnvironmentChecker dataSourceChecker = new
PostgreSQLDatabaseEnvironmentChecker();
+ PostgreSQLDatabasePrivilegeChecker dataSourceChecker = new
PostgreSQLDatabasePrivilegeChecker();
when(resultSet.getString("rolreplication")).thenReturn("t");
when(resultSet.getString("rolsuper")).thenReturn("f");
- dataSourceChecker.checkPrivilege(dataSource,
PrivilegeCheckType.PIPELINE);
+ dataSourceChecker.check(dataSource, PrivilegeCheckType.PIPELINE);
verify(resultSet, atLeastOnce()).getString("rolsuper");
}
@Test
void assertCheckRolSuper() throws SQLException {
- PostgreSQLDatabaseEnvironmentChecker dataSourceChecker = new
PostgreSQLDatabaseEnvironmentChecker();
+ PostgreSQLDatabasePrivilegeChecker dataSourceChecker = new
PostgreSQLDatabasePrivilegeChecker();
when(resultSet.getString("rolsuper")).thenReturn("t");
when(resultSet.getString("rolreplication")).thenReturn("f");
- dataSourceChecker.checkPrivilege(dataSource,
PrivilegeCheckType.PIPELINE);
+ dataSourceChecker.check(dataSource, PrivilegeCheckType.PIPELINE);
verify(resultSet, atLeastOnce()).getString("rolreplication");
}
@Test
void assertCheckNoPrivilege() throws SQLException {
- PostgreSQLDatabaseEnvironmentChecker dataSourceChecker = new
PostgreSQLDatabaseEnvironmentChecker();
+ PostgreSQLDatabasePrivilegeChecker dataSourceChecker = new
PostgreSQLDatabasePrivilegeChecker();
when(resultSet.getString("rolsuper")).thenReturn("f");
when(resultSet.getString("rolreplication")).thenReturn("f");
- assertThrows(MissingRequiredPrivilegeException.class, () ->
dataSourceChecker.checkPrivilege(dataSource, PrivilegeCheckType.PIPELINE));
+ assertThrows(MissingRequiredPrivilegeException.class, () ->
dataSourceChecker.check(dataSource, PrivilegeCheckType.PIPELINE));
verify(resultSet, atLeastOnce()).getString("rolreplication");
}
}
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/checker/PipelineDataSourceCheckEngine.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/checker/PipelineDataSourceCheckEngine.java
index 08cd90cb343..2554fe837c0 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/checker/PipelineDataSourceCheckEngine.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/checker/PipelineDataSourceCheckEngine.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.data.pipeline.core.checker;
import
org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithTargetTableNotEmptyException;
import
org.apache.shardingsphere.data.pipeline.core.importer.ImporterConfiguration;
import
org.apache.shardingsphere.data.pipeline.core.sqlbuilder.sql.PipelinePrepareSQLBuilder;
-import
org.apache.shardingsphere.infra.database.core.checker.DialectDatabaseEnvironmentChecker;
+import
org.apache.shardingsphere.infra.database.core.checker.DialectDatabasePrivilegeChecker;
import
org.apache.shardingsphere.infra.database.core.checker.PrivilegeCheckType;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
@@ -40,14 +40,14 @@ import java.util.Collection;
*/
public final class PipelineDataSourceCheckEngine {
- private final DialectDatabaseEnvironmentChecker checker;
+ private final DialectDatabasePrivilegeChecker privilegeChecker;
private final DialectPipelineDatabaseVariableChecker variableChecker;
private final PipelinePrepareSQLBuilder sqlBuilder;
public PipelineDataSourceCheckEngine(final DatabaseType databaseType) {
- checker =
DatabaseTypedSPILoader.findService(DialectDatabaseEnvironmentChecker.class,
databaseType).orElse(null);
+ privilegeChecker =
DatabaseTypedSPILoader.findService(DialectDatabasePrivilegeChecker.class,
databaseType).orElse(null);
variableChecker =
DatabaseTypedSPILoader.findService(DialectPipelineDatabaseVariableChecker.class,
databaseType).orElse(null);
sqlBuilder = new PipelinePrepareSQLBuilder(databaseType);
}
@@ -75,8 +75,8 @@ public final class PipelineDataSourceCheckEngine {
*/
public void checkSourceDataSources(final Collection<DataSource>
dataSources) {
checkConnection(dataSources);
- if (null != checker) {
- dataSources.forEach(each -> checker.checkPrivilege(each,
PrivilegeCheckType.PIPELINE));
+ if (null != privilegeChecker) {
+ dataSources.forEach(each -> privilegeChecker.check(each,
PrivilegeCheckType.PIPELINE));
}
if (null != variableChecker) {
dataSources.forEach(variableChecker::check);
diff --git
a/kernel/transaction/type/xa/core/src/main/java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManager.java
b/kernel/transaction/type/xa/core/src/main/java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManager.java
index 87f3825afd9..224412a8e54 100644
---
a/kernel/transaction/type/xa/core/src/main/java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManager.java
+++
b/kernel/transaction/type/xa/core/src/main/java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManager.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.transaction.xa;
import com.cedarsoftware.util.CaseInsensitiveMap;
import lombok.SneakyThrows;
-import
org.apache.shardingsphere.infra.database.core.checker.DialectDatabaseEnvironmentChecker;
+import
org.apache.shardingsphere.infra.database.core.checker.DialectDatabasePrivilegeChecker;
import
org.apache.shardingsphere.infra.database.core.checker.PrivilegeCheckType;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
@@ -60,8 +60,8 @@ public final class XAShardingSphereTransactionManager
implements ShardingSphereD
@Override
public void init(final Map<String, DatabaseType> databaseTypes, final
Map<String, DataSource> dataSources, final String providerType) {
for (Entry<String, DataSource> entry : dataSources.entrySet()) {
-
DatabaseTypedSPILoader.findService(DialectDatabaseEnvironmentChecker.class,
databaseTypes.get(entry.getKey()))
- .ifPresent(optional ->
optional.checkPrivilege(entry.getValue(), PrivilegeCheckType.XA));
+
DatabaseTypedSPILoader.findService(DialectDatabasePrivilegeChecker.class,
databaseTypes.get(entry.getKey()))
+ .ifPresent(optional -> optional.check(entry.getValue(),
PrivilegeCheckType.XA));
}
xaTransactionManagerProvider =
TypedSPILoader.getService(XATransactionManagerProvider.class, providerType);
xaTransactionManagerProvider.init();
