This is an automated email from the ASF dual-hosted git repository.
yx9o 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 8745e37a61e Refactor TestcontainersDatabaseType (#29479)
8745e37a61e is described below
commit 8745e37a61e61eaed20450de450f80fb183cf502
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Dec 21 00:49:21 2023 +0800
Refactor TestcontainersDatabaseType (#29479)
* Rename DataSourceCheckEngine.checkSourceDataSources()
* Refactor DataSourceCheckEngine
* Rename IncrementalTaskPreparer
* Rename IncrementalTaskPositionManager
* Rename IncrementalTaskPositionManager
* Refactor CDCJobAPI
* Add DialectDatabaseMetaData.isSupportGlobalCSN()
* Add DialectDatabaseMetaData.isSupportGlobalCSN()
* Fix javadoc
* Refactor TestcontainersDatabaseType
---
.../infra/database/testcontainers/type/TcClickHouseDatabaseType.java | 4 ++--
.../infra/database/testcontainers/type/TcMariaDBDatabaseType.java | 4 ++--
.../infra/database/testcontainers/type/TcMySQLDatabaseType.java | 4 ++--
.../infra/database/testcontainers/type/TcOracleDatabaseType.java | 4 ++--
.../infra/database/testcontainers/type/TcPostgreSQLDatabaseType.java | 4 ++--
.../infra/database/testcontainers/type/TcSQLServerDatabaseType.java | 4 ++--
.../database/testcontainers/type/TestcontainersDatabaseType.java | 2 +-
.../core/preparer/incremental/IncrementalTaskPositionManager.java | 2 +-
8 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcClickHouseDatabaseType.java
b/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcClickHouseDatabaseType.java
index 66dc84eb864..2e6c8735efb 100644
---
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcClickHouseDatabaseType.java
+++
b/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcClickHouseDatabaseType.java
@@ -31,7 +31,7 @@ public final class TcClickHouseDatabaseType implements
TestcontainersDatabaseTyp
@Override
public Collection<String> getJdbcUrlPrefixes() {
- return Collections.singletonList("jdbc:tc:clickhouse:");
+ return Collections.singleton("jdbc:tc:clickhouse:");
}
@Override
@@ -41,6 +41,6 @@ public final class TcClickHouseDatabaseType implements
TestcontainersDatabaseTyp
@Override
public String getType() {
- return "TestContainersClickHouse";
+ return "TC-ClickHouse";
}
}
diff --git
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcMariaDBDatabaseType.java
b/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcMariaDBDatabaseType.java
index 4b867c1ef01..154efe7aac5 100644
---
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcMariaDBDatabaseType.java
+++
b/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcMariaDBDatabaseType.java
@@ -31,7 +31,7 @@ public final class TcMariaDBDatabaseType implements
TestcontainersDatabaseType {
@Override
public Collection<String> getJdbcUrlPrefixes() {
- return Collections.singletonList("jdbc:tc:mariadb:");
+ return Collections.singleton("jdbc:tc:mariadb:");
}
@Override
@@ -41,6 +41,6 @@ public final class TcMariaDBDatabaseType implements
TestcontainersDatabaseType {
@Override
public String getType() {
- return "TestContainersMariaDB";
+ return "TC-MariaDB";
}
}
diff --git
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcMySQLDatabaseType.java
b/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcMySQLDatabaseType.java
index 793ef28af63..4e5b57cca17 100644
---
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcMySQLDatabaseType.java
+++
b/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcMySQLDatabaseType.java
@@ -31,7 +31,7 @@ public final class TcMySQLDatabaseType implements
TestcontainersDatabaseType {
@Override
public Collection<String> getJdbcUrlPrefixes() {
- return Collections.singletonList("jdbc:tc:mysql:");
+ return Collections.singleton("jdbc:tc:mysql:");
}
@Override
@@ -41,6 +41,6 @@ public final class TcMySQLDatabaseType implements
TestcontainersDatabaseType {
@Override
public String getType() {
- return "TestContainersMySQL";
+ return "TC-MySQL";
}
}
diff --git
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcOracleDatabaseType.java
b/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcOracleDatabaseType.java
index 0201750f3a8..f558f4728b9 100644
---
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcOracleDatabaseType.java
+++
b/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcOracleDatabaseType.java
@@ -31,7 +31,7 @@ public final class TcOracleDatabaseType implements
TestcontainersDatabaseType {
@Override
public Collection<String> getJdbcUrlPrefixes() {
- return Collections.singletonList("jdbc:tc:oracle:");
+ return Collections.singleton("jdbc:tc:oracle:");
}
@Override
@@ -41,6 +41,6 @@ public final class TcOracleDatabaseType implements
TestcontainersDatabaseType {
@Override
public String getType() {
- return "TestContainersOracle";
+ return "TC-Oracle";
}
}
diff --git
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcPostgreSQLDatabaseType.java
b/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcPostgreSQLDatabaseType.java
index c4eba7a2b78..55e0da0fe62 100644
---
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcPostgreSQLDatabaseType.java
+++
b/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcPostgreSQLDatabaseType.java
@@ -31,7 +31,7 @@ public final class TcPostgreSQLDatabaseType implements
TestcontainersDatabaseTyp
@Override
public Collection<String> getJdbcUrlPrefixes() {
- return Collections.singletonList("jdbc:tc:postgresql:");
+ return Collections.singleton("jdbc:tc:postgresql:");
}
@Override
@@ -41,6 +41,6 @@ public final class TcPostgreSQLDatabaseType implements
TestcontainersDatabaseTyp
@Override
public String getType() {
- return "TestContainersPostgreSQL";
+ return "TC-PostgreSQL";
}
}
diff --git
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcSQLServerDatabaseType.java
b/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcSQLServerDatabaseType.java
index d67f9417fc4..966bb392c13 100644
---
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcSQLServerDatabaseType.java
+++
b/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcSQLServerDatabaseType.java
@@ -31,7 +31,7 @@ public final class TcSQLServerDatabaseType implements
TestcontainersDatabaseType
@Override
public Collection<String> getJdbcUrlPrefixes() {
- return Collections.singletonList("jdbc:tc:sqlserver:");
+ return Collections.singleton("jdbc:tc:sqlserver:");
}
@Override
@@ -41,6 +41,6 @@ public final class TcSQLServerDatabaseType implements
TestcontainersDatabaseType
@Override
public String getType() {
- return "TestContainersSQLServer";
+ return "TC-SQLServer";
}
}
diff --git
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TestcontainersDatabaseType.java
b/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TestcontainersDatabaseType.java
index 0b6e496c545..ae2e8bcbae3 100644
---
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TestcontainersDatabaseType.java
+++
b/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TestcontainersDatabaseType.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.infra.database.testcontainers.type;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
/**
- * Abstract Database type in testcontainers-java.
+ * Database type for Testcontainer.
* All jdbcUrl prefixes supported by testcontainers-java should extend this
class.
*/
public interface TestcontainersDatabaseType extends DatabaseType {
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/incremental/IncrementalTaskPositionManager.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/incremental/IncrementalTaskPositionManager.java
index c935e7fac14..01af4baee2d 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/incremental/IncrementalTaskPositionManager.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/incremental/IncrementalTaskPositionManager.java
@@ -54,7 +54,7 @@ public final class IncrementalTaskPositionManager {
/**
* Get ingest position.
*
- * @param initialProgress initial iob item incremental tasks progress
+ * @param initialProgress initial job item incremental tasks progress
* @param dumperContext incremental dumper context
* @param dataSourceManager pipeline data source manager
* @return ingest position
