This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 82812143f51 Refactor PipelineContainerComposer createQualifiedTable
and createSchema (#37874)
82812143f51 is described below
commit 82812143f51ed378b61f8babeaa2865b2c4d3d34
Author: Hongsheng Zhong <[email protected]>
AuthorDate: Wed Jan 28 19:11:16 2026 +0800
Refactor PipelineContainerComposer createQualifiedTable and createSchema
(#37874)
* Rename PipelineContainerComposer.createQualifiedTable
* Refactor PipelineContainerComposer.createSchema: change param
---
.../operation/pipeline/cases/PipelineContainerComposer.java | 13 +++++++------
.../test/e2e/operation/pipeline/cases/cdc/CDCE2EIT.java | 6 +++---
.../migration/general/PostgreSQLMigrationGeneralE2EIT.java | 2 +-
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/PipelineContainerComposer.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/PipelineContainerComposer.java
index baf0e8e91a9..a017dd11a8a 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/PipelineContainerComposer.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/PipelineContainerComposer.java
@@ -313,28 +313,29 @@ public final class PipelineContainerComposer implements
AutoCloseable {
/**
* Create schema.
*
- * @param connection connection
+ * @param dataSource data source
* @param seconds sleep seconds
* @throws SQLException SQL exception
*/
- public void createSchema(final Connection connection, final int seconds)
throws SQLException {
+ public void createSchema(final DataSource dataSource, final int seconds)
throws SQLException {
if (!new
DatabaseTypeRegistry(databaseType).getDialectDatabaseMetaData().getSchemaOption().isSchemaAvailable())
{
return;
}
- try (Statement statement = connection.createStatement()) {
+ try (
+ Connection connection = dataSource.getConnection();
+ Statement statement = connection.createStatement()) {
statement.execute(String.format("CREATE SCHEMA %s", SCHEMA_NAME));
}
sleepSeconds(seconds);
}
/**
- * Create qualified table.
+ * Create qualified table with schema.
*
* @param tableName table name
* @return qualified table
*/
- // TODO Rename, add schema
- public QualifiedTable createQualifiedTable(final String tableName) {
+ public QualifiedTable createQualifiedTableWithSchema(final String
tableName) {
String schemaName = new
DatabaseTypeRegistry(databaseType).getDialectDatabaseMetaData().getSchemaOption().isSchemaAvailable()
? SCHEMA_NAME : null;
return new QualifiedTable(schemaName, tableName);
}
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/cdc/CDCE2EIT.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/cdc/CDCE2EIT.java
index 36c9c191965..390fabb874d 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/cdc/CDCE2EIT.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/cdc/CDCE2EIT.java
@@ -102,7 +102,7 @@ class CDCE2EIT {
}
createOrderTableRule(containerComposer);
distSQLFacade.createBroadcastRule("t_address");
- QualifiedTable orderQualifiedTable =
containerComposer.createQualifiedTable(SOURCE_TABLE_NAME);
+ QualifiedTable orderQualifiedTable =
containerComposer.createQualifiedTableWithSchema(SOURCE_TABLE_NAME);
initSchemaAndTable(containerComposer,
containerComposer.getProxyDataSource(), orderQualifiedTable, 3);
PipelineDataSource jdbcDataSource = new
PipelineDataSource(containerComposer.generateShardingSphereDataSourceFromProxy(),
containerComposer.getDatabaseType());
log.info("init data begin: {}", LocalDateTime.now());
@@ -143,11 +143,11 @@ class CDCE2EIT {
}
private void initSchemaAndTable(final PipelineContainerComposer
containerComposer, final DataSource dataSource, final QualifiedTable
orderQualifiedTable, final int seconds) throws SQLException {
+ containerComposer.createSchema(dataSource, seconds);
+ new IntPkLargeOrderDAO(dataSource,
containerComposer.getDatabaseType(), orderQualifiedTable).createTable();
try (
Connection connection = dataSource.getConnection();
Statement statement = connection.createStatement()) {
- containerComposer.createSchema(connection, seconds);
- new IntPkLargeOrderDAO(dataSource,
containerComposer.getDatabaseType(), orderQualifiedTable).createTable();
statement.execute("CREATE TABLE t_address(id integer primary key,
address_name varchar(255))");
statement.execute("CREATE TABLE t_single(id integer primary key)");
}
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/migration/general/PostgreSQLMigrationGeneralE2EIT.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/migration/general/PostgreSQLMigrationGeneralE2EIT.java
index 94d0c4c53b8..3aacb9aa5ef 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/migration/general/PostgreSQLMigrationGeneralE2EIT.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/migration/general/PostgreSQLMigrationGeneralE2EIT.java
@@ -66,7 +66,7 @@ class PostgreSQLMigrationGeneralE2EIT extends
AbstractMigrationE2EIT {
distSQLFacade.alterPipelineRule();
createSourceSchema(containerComposer,
PipelineContainerComposer.SCHEMA_NAME);
IntPkLargeOrderDAO orderDAO = new
IntPkLargeOrderDAO(containerComposer.getSourceDataSource(),
- containerComposer.getDatabaseType(),
containerComposer.createQualifiedTable(SOURCE_TABLE_NAME));
+ containerComposer.getDatabaseType(),
containerComposer.createQualifiedTableWithSchema(SOURCE_TABLE_NAME));
orderDAO.createTable();
IntPkOrderItemDAO orderItemDAO = new
IntPkOrderItemDAO(containerComposer.getSourceDataSource(),
containerComposer.getDatabaseType(), PipelineContainerComposer.SCHEMA_NAME);
orderItemDAO.createTable();
