Skip to content

Refactor EmbeddedStorageContainer #36580

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 1 commit into from
Sep 16, 2025
Merged

Refactor EmbeddedStorageContainer #36580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 8 additions & 15 deletions ...gsphere/test/e2e/env/container/atomic/storage/type/embedded/EmbeddedStorageContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
import org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtils;
import org.apache.shardingsphere.test.e2e.env.runtime.DataSourceEnvironment;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import org.apache.shardingsphere.test.e2e.env.runtime.scenario.database.DatabaseEnvironmentManager;
import org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath.Type;

Expand Down Expand Up @@ -51,25 +52,17 @@ public abstract class EmbeddedStorageContainer implements EmbeddedITContainer, S
protected EmbeddedStorageContainer(final DatabaseType databaseType, final String scenario) {
this.databaseType = databaseType;
this.scenario = scenario;
actualDataSourceMap = createActualDataSourceMap();
expectedDataSourceMap = createExpectedDataSourceMap();
actualDataSourceMap = createDataSourceMap(Type.ACTUAL);
expectedDataSourceMap = createDataSourceMap(Type.EXPECTED);
}

private Map<String, DataSource> createActualDataSourceMap() {
Collection<String> databaseNames = DatabaseEnvironmentManager.getDatabaseTypes(scenario, databaseType, Type.ACTUAL).entrySet().stream()
private Map<String, DataSource> createDataSourceMap(final Type type) {
E2ETestEnvironment env = E2ETestEnvironment.getInstance();
Collection<String> databaseNames = DatabaseEnvironmentManager.getDatabaseTypes(scenario, databaseType, type).entrySet().stream()
.filter(entry -> entry.getValue().getClass().isAssignableFrom(databaseType.getClass())).map(Entry::getKey).collect(Collectors.toList());
Map<String, DataSource> result = new LinkedHashMap<>(databaseNames.size(), 1F);
databaseNames.forEach(each -> result.put(each, StorageContainerUtils.generateDataSource(DataSourceEnvironment.getURL(databaseType, null, 0, each),
"root", "Root@123")));
return result;
}

private Map<String, DataSource> createExpectedDataSourceMap() {
Collection<String> databaseNames = DatabaseEnvironmentManager.getDatabaseTypes(scenario, databaseType, Type.EXPECTED).entrySet().stream()
.filter(entry -> entry.getValue().getClass().isAssignableFrom(databaseType.getClass())).map(Entry::getKey).collect(Collectors.toList());
Map<String, DataSource> result = new LinkedHashMap<>(databaseNames.size(), 1F);
databaseNames.forEach(each -> result.put(each, StorageContainerUtils.generateDataSource(DataSourceEnvironment.getURL(databaseType, null, 0, each),
"root", "Root@123")));
databaseNames.forEach(each -> result.put(each, StorageContainerUtils.generateDataSource(
DataSourceEnvironment.getURL(databaseType, env.getNativeStorageHost(), env.getNativeStoragePort(), each), env.getNativeStorageUsername(), env.getNativeStoragePassword())));
return result;
}

Expand Down
4 changes: 2 additions & 2 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 @@ -73,7 +73,7 @@ public NativeStorageContainer(final DatabaseType databaseType, final String scen

private void initDatabase() {
DataSource dataSource = StorageContainerUtils.generateDataSource(
DataSourceEnvironment.getURL(databaseType, E2ETestEnvironment.getInstance().getNativeStorageHost(), Integer.parseInt(E2ETestEnvironment.getInstance().getNativeStoragePort())),
DataSourceEnvironment.getURL(databaseType, E2ETestEnvironment.getInstance().getNativeStorageHost(), E2ETestEnvironment.getInstance().getNativeStoragePort()),
E2ETestEnvironment.getInstance().getNativeStorageUsername(), E2ETestEnvironment.getInstance().getNativeStoragePassword());
new MountSQLResourceGenerator(option, databaseType).generate(0, scenario).keySet().forEach(each -> SQLScriptUtils.execute(dataSource, each));
}
Expand All @@ -89,7 +89,7 @@ private Map<String, DataSource> getDataSourceMap(final Collection<String> databa
Map<String, DataSource> result = new HashMap<>(databaseNames.size(), 1F);
for (String each : databaseNames) {
DataSource dataSource = StorageContainerUtils.generateDataSource(DataSourceEnvironment.getURL(databaseType, E2ETestEnvironment.getInstance().getNativeStorageHost(),
Integer.parseInt(E2ETestEnvironment.getInstance().getNativeStoragePort()), each),
E2ETestEnvironment.getInstance().getNativeStoragePort(), each),
E2ETestEnvironment.getInstance().getNativeStorageUsername(), E2ETestEnvironment.getInstance().getNativeStoragePassword());
result.put(each, dataSource);
}
Expand Down
10 changes: 5 additions & 5 deletions .../env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public final class E2ETestEnvironment {

private final String nativeStorageHost;

private final String nativeStoragePort;
private final int nativeStoragePort;

private final String nativeStorageUsername;

Expand All @@ -64,10 +64,10 @@ private E2ETestEnvironment() {
scenarios = getScenarios(props);
smoke = Boolean.parseBoolean(props.getProperty("it.run.smoke"));
clusterEnvironment = new ClusterEnvironment(props);
nativeStorageHost = props.getProperty("it.native.storage.host");
nativeStoragePort = props.getProperty("it.native.storage.port");
nativeStorageUsername = props.getProperty("it.native.storage.username");
nativeStoragePassword = props.getProperty("it.native.storage.password");
nativeStorageHost = props.getProperty("it.native.storage.host", "127.0.0.1");
nativeStoragePort = Integer.parseInt(props.getProperty("it.native.storage.port", "0"));
nativeStorageUsername = props.getProperty("it.native.storage.username", "root");
nativeStoragePassword = props.getProperty("it.native.storage.password", "Root@123");
governanceCenter = props.getProperty("it.env.governance.center");
}

Expand Down