Skip to content

Refactor StorageContainerUtils #36610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 18, 2025
Merged

Refactor StorageContainerUtils #36610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
068ecd0
Code format for TransactionBaseE2EIT
terrymanu Sep 18, 2025
2530e13
Refactor StorageContainerUtils
terrymanu Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...phere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public DataSource getTargetDataSource(final String serverLists) {
if (null == dataSource) {
DataSourceEnvironment dataSourceEnvironment = DatabaseTypedSPILoader.getService(DataSourceEnvironment.class, databaseType);
targetDataSourceProvider.set(StorageContainerUtils.generateDataSource(
dataSourceEnvironment.getURL(getHost(), getMappedPort(3307), config.getProxyDataSourceName()), ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD));
dataSourceEnvironment.getURL(getHost(), getMappedPort(3307), config.getProxyDataSourceName()), ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD, 2));
}
return targetDataSourceProvider.get();
}
Expand Down
2 changes: 1 addition & 1 deletion ...here/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyEmbeddedContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public DataSource getTargetDataSource(final String serverLists) {
if (null == dataSource) {
DataSourceEnvironment dataSourceEnvironment = DatabaseTypedSPILoader.getService(DataSourceEnvironment.class, databaseType);
targetDataSourceProvider.set(StorageContainerUtils.generateDataSource(dataSourceEnvironment.getURL(
"127.0.0.1", 3307, config.getProxyDataSourceName()), ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD));
"127.0.0.1", 3307, config.getProxyDataSourceName()), ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD, 2));
}
return targetDataSourceProvider.get();
}
Expand Down
2 changes: 1 addition & 1 deletion ...re/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public DataSource getTargetDataSource(final String serverLists) {
if (null == dataSource) {
DataSourceEnvironment dataSourceEnvironment = DatabaseTypedSPILoader.getService(DataSourceEnvironment.class, databaseType);
targetDataSourceProvider.set(StorageContainerUtils.generateDataSource(
dataSourceEnvironment.getURL(getHost(), getMappedPort(3307), config.getProxyDataSourceName()), ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD));
dataSourceEnvironment.getURL(getHost(), getMappedPort(3307), config.getProxyDataSourceName()), ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD, 2));
}
return targetDataSourceProvider.get();
}
Expand Down
11 changes: 3 additions & 8 deletions ...dingsphere/test/e2e/env/container/atomic/storage/type/natived/NativeStorageContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ private void initDatabase() {
if (null != option) {
DataSourceEnvironment dataSourceEnvironment = DatabaseTypedSPILoader.getService(DataSourceEnvironment.class, databaseType);
DataSource dataSource = StorageContainerUtils.generateDataSource(
dataSourceEnvironment.getURL(env.getNativeStorageHost(), env.getNativeStoragePort()), env.getNativeStorageUsername(), env.getNativeStoragePassword());
dataSourceEnvironment.getURL(env.getNativeStorageHost(), env.getNativeStoragePort()), env.getNativeStorageUsername(), env.getNativeStoragePassword(), 2);
new MountSQLResourceGenerator(option).generate(0, scenario).keySet().forEach(each -> SQLScriptUtils.execute(dataSource, each));
}
}
Expand All @@ -91,14 +91,9 @@ private Map<String, DataSource> createDataSourceMap(final Type type) {
}

private Map<String, DataSource> getDataSourceMap(final Collection<String> databaseNames) {
Map<String, DataSource> result = new HashMap<>(databaseNames.size(), 1F);
DataSourceEnvironment dataSourceEnvironment = DatabaseTypedSPILoader.getService(DataSourceEnvironment.class, databaseType);
for (String each : databaseNames) {
DataSource dataSource = StorageContainerUtils.generateDataSource(
dataSourceEnvironment.getURL(env.getNativeStorageHost(), env.getNativeStoragePort(), each), env.getNativeStorageUsername(), env.getNativeStoragePassword());
result.put(each, dataSource);
}
return result;
return databaseNames.stream().collect(Collectors.toMap(each -> each, each -> StorageContainerUtils.generateDataSource(
dataSourceEnvironment.getURL(env.getNativeStorageHost(), env.getNativeStoragePort(), each), env.getNativeStorageUsername(), env.getNativeStoragePassword(), 2)));
}

/**
Expand Down
33 changes: 3 additions & 30 deletions ...a/org/apache/shardingsphere/test/e2e/env/container/atomic/util/StorageContainerUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,44 +33,17 @@
public final class StorageContainerUtils {

/**
* Generate datasource.
* Generate data source.
*
* @param jdbcUrl JDBC URL for generating datasource
* @param username username
* @param password password
* @return data source
*/
public static DataSource generateDataSource(final String jdbcUrl, final String username, final String password) {
return generateDataSource(jdbcUrl, username, password, 2);
}

/**
* Generate datasource.
*
* @param jdbcUrl JDBC URL for generating datasource
* @param jdbcUrl JDBC URL
* @param username username
* @param password password
* @param maximumPoolSize maximum pool size
* @return data source
*/
public static DataSource generateDataSource(final String jdbcUrl, final String username, final String password, final int maximumPoolSize) {
String driverClassName = DatabaseTypedSPILoader.getService(DataSourceEnvironment.class, DatabaseTypeFactory.get(jdbcUrl)).getDriverClassName();
return generateDataSource(jdbcUrl, username, password, maximumPoolSize, driverClassName);
}

/**
* Generate datasource.
*
* @param jdbcUrl JDBC URL for generating datasource
* @param username username
* @param password password
* @param maximumPoolSize maximum pool size
* @param driverClassName driver class name
* @return data source
*/
public static DataSource generateDataSource(final String jdbcUrl, final String username, final String password, final int maximumPoolSize, final String driverClassName) {
HikariDataSource result = new HikariDataSource();
result.setDriverClassName(driverClassName);
result.setDriverClassName(DatabaseTypedSPILoader.getService(DataSourceEnvironment.class, DatabaseTypeFactory.get(jdbcUrl)).getDriverClassName());
result.setJdbcUrl(jdbcUrl);
result.setUsername(username);
result.setPassword(password);
Expand Down
4 changes: 2 additions & 2 deletions ...rg/apache/shardingsphere/test/e2e/operation/pipeline/cases/PipelineContainerComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@ public PipelineContainerComposer(final PipelineTestParameter testParam, final Pi
}
extraSQLCommand = JAXB.unmarshal(Objects.requireNonNull(Thread.currentThread().getContextClassLoader().getResource(testParam.getScenario())), ExtraSQLCommand.class);
containerComposer.start();
sourceDataSource = StorageContainerUtils.generateDataSource(getActualJdbcUrlTemplate(DS_0, false), username, password);
sourceDataSource = StorageContainerUtils.generateDataSource(getActualJdbcUrlTemplate(DS_0, false), username, password, 2);
proxyDataSource = StorageContainerUtils.generateDataSource(
appendExtraParameter(containerComposer.getProxyJdbcUrl(PROXY_DATABASE)), ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD);
appendExtraParameter(containerComposer.getProxyJdbcUrl(PROXY_DATABASE)), ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD, 2);
init(jobType);
}

Expand Down
10 changes: 5 additions & 5 deletions ...pache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionBaseE2EIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ private void doCallTestCases(final TransactionTestParameter testParam, final Tra
for (Class<? extends BaseTransactionTestCase> each : testParam.getTransactionTestCaseClasses()) {
log.info("Transaction IT {} -> {} test begin.", testParam, each.getSimpleName());
try {
each.getConstructor(TransactionTestCaseParameter.class).newInstance(new TransactionTestCaseParameter(this, containerComposer.getDataSource(), testParam.getTransactionTypes().get(0)))
.execute(containerComposer);
each.getConstructor(TransactionTestCaseParameter.class).newInstance(
new TransactionTestCaseParameter(this, containerComposer.getDataSource(), testParam.getTransactionTypes().get(0))).execute(containerComposer);
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
Expand All @@ -167,8 +167,8 @@ private void doCallTestCases(final TransactionTestParameter testParam, final Tra
}
log.info("Call transaction IT {} -> {} -> {} -> {} test begin.", testParam, transactionType, provider, each.getSimpleName());
try {
each.getConstructor(TransactionTestCaseParameter.class).newInstance(new TransactionTestCaseParameter(this, containerComposer.getDataSource(), transactionType))
.execute(containerComposer);
each.getConstructor(TransactionTestCaseParameter.class).newInstance(
new TransactionTestCaseParameter(this, containerComposer.getDataSource(), transactionType)).execute(containerComposer);
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
Expand Down Expand Up @@ -196,7 +196,7 @@ public void createAccountTable(final Connection connection) throws SQLException
* @throws SQLException SQL exception
*/
public void dropAccountTable(final Connection connection) throws SQLException {
executeWithLog(connection, "drop table if exists account;");
executeWithLog(connection, "DROP TABLE IF EXISTS account;");
}

private void alterLocalTransactionRule(final TransactionContainerComposer containerComposer) throws SQLException {
Expand Down