This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 397576d3d62 Rename DialectDataSourceChecker (#27253)
397576d3d62 is described below
commit 397576d3d620c82660ca987c4fb8b1ed02e54cb0
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Jul 17 19:49:21 2023 +0800
Rename DialectDataSourceChecker (#27253)
---
...aSourceChecker.java => DialectDataSourceChecker.java} | 6 +++---
.../pipeline/core/preparer/PipelineJobPreparerUtils.java | 2 +-
.../datasource/{checker => }/DataSourceCheckEngine.java | 16 ++++++++--------
.../{checker => }/DataSourceCheckEngineTest.java | 2 +-
.../mysql/check/datasource/MySQLDataSourceChecker.java | 4 ++--
...ere.data.pipeline.spi.check.DialectDataSourceChecker} | 0
.../check/datasource/OpenGaussDataSourceChecker.java | 4 ++--
...ere.data.pipeline.spi.check.DialectDataSourceChecker} | 0
.../check/datasource/PostgreSQLDataSourceChecker.java | 4 ++--
...ere.data.pipeline.spi.check.DialectDataSourceChecker} | 0
.../pipeline/core/fixture/FixtureDataSourceChecker.java | 4 ++--
...ere.data.pipeline.spi.check.DialectDataSourceChecker} | 0
12 files changed, 21 insertions(+), 21 deletions(-)
diff --git
a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/check/datasource/DataSourceChecker.java
b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/check/DialectDataSourceChecker.java
similarity index 89%
rename from
kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/check/datasource/DataSourceChecker.java
rename to
kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/check/DialectDataSourceChecker.java
index 6bcfd3c4de9..d86423a4d4f 100644
---
a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/check/datasource/DataSourceChecker.java
+++
b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/check/DialectDataSourceChecker.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.data.pipeline.spi.check.datasource;
+package org.apache.shardingsphere.data.pipeline.spi.check;
import org.apache.shardingsphere.infra.spi.DatabaseTypedSPI;
import org.apache.shardingsphere.infra.util.spi.annotation.SingletonSPI;
@@ -23,10 +23,10 @@ import
org.apache.shardingsphere.infra.util.spi.annotation.SingletonSPI;
import javax.sql.DataSource;
/**
- * Data source checker.
+ * Dialect data source checker.
*/
@SingletonSPI
-public interface DataSourceChecker extends DatabaseTypedSPI {
+public interface DialectDataSourceChecker extends DatabaseTypedSPI {
/**
* Check user privileges.
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/PipelineJobPreparerUtils.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/PipelineJobPreparerUtils.java
index cf16ecf36cf..20511f697b0 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/PipelineJobPreparerUtils.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/PipelineJobPreparerUtils.java
@@ -32,7 +32,7 @@ import
org.apache.shardingsphere.data.pipeline.common.job.progress.JobItemIncrem
import
org.apache.shardingsphere.data.pipeline.core.preparer.datasource.DataSourcePreparer;
import
org.apache.shardingsphere.data.pipeline.core.preparer.datasource.PrepareTargetSchemasParameter;
import
org.apache.shardingsphere.data.pipeline.core.preparer.datasource.PrepareTargetTablesParameter;
-import
org.apache.shardingsphere.data.pipeline.core.preparer.datasource.checker.DataSourceCheckEngine;
+import
org.apache.shardingsphere.data.pipeline.core.preparer.datasource.DataSourceCheckEngine;
import
org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumperCreator;
import
org.apache.shardingsphere.data.pipeline.spi.ingest.position.PositionInitializer;
import org.apache.shardingsphere.infra.database.type.BranchDatabaseType;
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/checker/DataSourceCheckEngine.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/DataSourceCheckEngine.java
similarity index 90%
rename from
kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/checker/DataSourceCheckEngine.java
rename to
kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/DataSourceCheckEngine.java
index bd388e13688..702e3f7853b 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/checker/DataSourceCheckEngine.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/DataSourceCheckEngine.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.data.pipeline.core.preparer.datasource.checker;
+package org.apache.shardingsphere.data.pipeline.core.preparer.datasource;
import
org.apache.shardingsphere.data.pipeline.api.config.TableNameSchemaNameMapping;
import
org.apache.shardingsphere.data.pipeline.common.sqlbuilder.PipelineCommonSQLBuilder;
import
org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithInvalidConnectionException;
import
org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithTargetTableNotEmptyException;
-import
org.apache.shardingsphere.data.pipeline.spi.check.datasource.DataSourceChecker;
+import
org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.DatabaseTypedSPILoader;
@@ -39,11 +39,11 @@ public final class DataSourceCheckEngine {
private final DatabaseType databaseType;
- private final DataSourceChecker dataSourceChecker;
+ private final DialectDataSourceChecker dialectDataSourceChecker;
public DataSourceCheckEngine(final DatabaseType databaseType) {
this.databaseType = databaseType;
- dataSourceChecker =
DatabaseTypedSPILoader.findService(DataSourceChecker.class,
databaseType).orElse(null);
+ dialectDataSourceChecker =
DatabaseTypedSPILoader.findService(DialectDataSourceChecker.class,
databaseType).orElse(null);
}
/**
@@ -103,11 +103,11 @@ public final class DataSourceCheckEngine {
* @param dataSources data sources
*/
public void checkPrivilege(final Collection<? extends DataSource>
dataSources) {
- if (null == dataSourceChecker) {
+ if (null == dialectDataSourceChecker) {
return;
}
for (DataSource each : dataSources) {
- dataSourceChecker.checkPrivilege(each);
+ dialectDataSourceChecker.checkPrivilege(each);
}
}
@@ -117,11 +117,11 @@ public final class DataSourceCheckEngine {
* @param dataSources data sources
*/
public void checkVariable(final Collection<? extends DataSource>
dataSources) {
- if (null == dataSourceChecker) {
+ if (null == dialectDataSourceChecker) {
return;
}
for (DataSource each : dataSources) {
- dataSourceChecker.checkVariable(each);
+ dialectDataSourceChecker.checkVariable(each);
}
}
}
diff --git
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/checker/DataSourceCheckEngineTest.java
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/DataSourceCheckEngineTest.java
similarity index 99%
rename from
kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/checker/DataSourceCheckEngineTest.java
rename to
kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/DataSourceCheckEngineTest.java
index dbebfa6f1b4..122718e2de0 100644
---
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/checker/DataSourceCheckEngineTest.java
+++
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/DataSourceCheckEngineTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.data.pipeline.core.preparer.datasource.checker;
+package org.apache.shardingsphere.data.pipeline.core.preparer.datasource;
import
org.apache.shardingsphere.data.pipeline.api.config.TableNameSchemaNameMapping;
import
org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithInvalidConnectionException;
diff --git
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/check/datasource/MySQLDataSourceChecker.java
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/check/datasource/MySQLDataSourceChecker.java
index 673818b1141..ee438575f71 100644
---
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/check/datasource/MySQLDataSourceChecker.java
+++
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/check/datasource/MySQLDataSourceChecker.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.data.pipeline.mysql.check.datasource;
import
org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithCheckPrivilegeFailedException;
import
org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithInvalidSourceDataSourceException;
import
org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithoutEnoughPrivilegeException;
-import
org.apache.shardingsphere.data.pipeline.spi.check.datasource.DataSourceChecker;
+import
org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker;
import
org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import javax.sql.DataSource;
@@ -37,7 +37,7 @@ import java.util.stream.Collectors;
/**
* Data source checker for MySQL.
*/
-public final class MySQLDataSourceChecker implements DataSourceChecker {
+public final class MySQLDataSourceChecker implements DialectDataSourceChecker {
private static final String SHOW_GRANTS_SQL = "SHOW GRANTS";
diff --git
a/kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.check.datasource.DataSourceChecker
b/kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker
similarity index 100%
rename from
kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.check.datasource.DataSourceChecker
rename to
kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker
diff --git
a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/check/datasource/OpenGaussDataSourceChecker.java
b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/check/datasource/OpenGaussDataSourceChecker.java
index 83e2fc1749e..88232723909 100644
---
a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/check/datasource/OpenGaussDataSourceChecker.java
+++
b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/check/datasource/OpenGaussDataSourceChecker.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.data.pipeline.opengauss.check.datasource;
import
org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithCheckPrivilegeFailedException;
import
org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithoutEnoughPrivilegeException;
import
org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithoutUserException;
-import
org.apache.shardingsphere.data.pipeline.spi.check.datasource.DataSourceChecker;
+import
org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker;
import
org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import javax.sql.DataSource;
@@ -34,7 +34,7 @@ import java.util.Collections;
/**
* Data source checker of openGauss.
*/
-public final class OpenGaussDataSourceChecker implements DataSourceChecker {
+public final class OpenGaussDataSourceChecker implements
DialectDataSourceChecker {
private static final String SHOW_GRANTS_SQL = "SELECT * FROM pg_roles
WHERE rolname = ?";
diff --git
a/kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.check.datasource.DataSourceChecker
b/kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker
similarity index 100%
rename from
kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.check.datasource.DataSourceChecker
rename to
kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker
diff --git
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/check/datasource/PostgreSQLDataSourceChecker.java
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/check/datasource/PostgreSQLDataSourceChecker.java
index 5bc0e06ea1b..b60d5c0f4c0 100644
---
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/check/datasource/PostgreSQLDataSourceChecker.java
+++
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/check/datasource/PostgreSQLDataSourceChecker.java
@@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j;
import
org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithCheckPrivilegeFailedException;
import
org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithoutEnoughPrivilegeException;
import
org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithoutUserException;
-import
org.apache.shardingsphere.data.pipeline.spi.check.datasource.DataSourceChecker;
+import
org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker;
import
org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import javax.sql.DataSource;
@@ -36,7 +36,7 @@ import java.util.Collections;
* PostgreSQL Data source checker.
*/
@Slf4j
-public final class PostgreSQLDataSourceChecker implements DataSourceChecker {
+public final class PostgreSQLDataSourceChecker implements
DialectDataSourceChecker {
private static final String SHOW_GRANTS_SQL = "SELECT * FROM pg_roles
WHERE rolname = ?";
diff --git
a/kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.check.datasource.DataSourceChecker
b/kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker
similarity index 100%
rename from
kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.check.datasource.DataSourceChecker
rename to
kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureDataSourceChecker.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureDataSourceChecker.java
index db12856d6e7..e18e2acc314 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureDataSourceChecker.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureDataSourceChecker.java
@@ -17,11 +17,11 @@
package org.apache.shardingsphere.test.it.data.pipeline.core.fixture;
-import
org.apache.shardingsphere.data.pipeline.spi.check.datasource.DataSourceChecker;
+import
org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker;
import javax.sql.DataSource;
-public final class FixtureDataSourceChecker implements DataSourceChecker {
+public final class FixtureDataSourceChecker implements
DialectDataSourceChecker {
@Override
public void checkPrivilege(final DataSource dataSource) {
diff --git
a/test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.check.datasource.DataSourceChecker
b/test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker
similarity index 100%
rename from
test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.check.datasource.DataSourceChecker
rename to
test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker
