This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 2dd432e94be Refactor E2EEnvironmentEngine (#35252)
2dd432e94be is described below
commit 2dd432e94bea7c48d0d7c66df3c528aaa497d3ea
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Apr 26 10:59:07 2025 +0800
Refactor E2EEnvironmentEngine (#35252)
---
.../e2e/env/container/atomic/util/SQLScriptUtils.java | 19 +++++++++----------
.../test/e2e/env/E2EEnvironmentEngine.java | 10 ++++++----
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/SQLScriptUtils.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/SQLScriptUtils.java
index 3ee2219f802..a75f48d17d8 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/SQLScriptUtils.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/SQLScriptUtils.java
@@ -17,6 +17,8 @@
package org.apache.shardingsphere.test.e2e.env.container.atomic.util;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import lombok.SneakyThrows;
import org.apache.commons.lang3.StringUtils;
import org.h2.util.ScriptReader;
@@ -37,6 +39,7 @@ import java.sql.Statement;
/**
* Batched SQL utility class.
*/
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class SQLScriptUtils {
private static final int BATCH_SIZE = 100;
@@ -51,12 +54,12 @@ public final class SQLScriptUtils {
public static void execute(final DataSource dataSource, final String
scriptFilePath) {
try (
Connection connection = dataSource.getConnection();
- Reader reader = getReader(scriptFilePath)) {
- Statement statement = connection.createStatement();
- ScriptReader r = new ScriptReader(reader);
- r.setSkipRemarks(true);
+ Statement statement = connection.createStatement();
+ Reader reader = getReader(scriptFilePath);
+ ScriptReader scriptReader = new ScriptReader(reader)) {
+ scriptReader.setSkipRemarks(true);
while (true) {
- String sql = r.readStatement();
+ String sql = scriptReader.readStatement();
if (null == sql) {
break;
}
@@ -106,10 +109,6 @@ public final class SQLScriptUtils {
private static Reader getReader(final String scriptFilePath) throws
FileNotFoundException {
InputStream resourceAsStream =
SQLScriptUtils.class.getClassLoader().getResourceAsStream(StringUtils.removeStart(scriptFilePath,
"/"));
- if (resourceAsStream != null) {
- return new BufferedReader(new InputStreamReader(resourceAsStream,
StandardCharsets.UTF_8));
- } else {
- return new FileReader(scriptFilePath);
- }
+ return resourceAsStream == null ? new FileReader(scriptFilePath) : new
BufferedReader(new InputStreamReader(resourceAsStream, StandardCharsets.UTF_8));
}
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/E2EEnvironmentEngine.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/E2EEnvironmentEngine.java
index 002395dab89..c237b40287f 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/E2EEnvironmentEngine.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/E2EEnvironmentEngine.java
@@ -17,14 +17,15 @@
package org.apache.shardingsphere.test.e2e.env;
+import lombok.AccessLevel;
import lombok.Getter;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import
org.apache.shardingsphere.test.e2e.env.container.compose.ContainerComposer;
-import
org.apache.shardingsphere.test.e2e.env.container.compose.ContainerComposerRegistry;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.SQLScriptUtils;
+import
org.apache.shardingsphere.test.e2e.env.container.compose.ContainerComposer;
+import
org.apache.shardingsphere.test.e2e.env.container.compose.ContainerComposerRegistry;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath;
import javax.sql.DataSource;
@@ -43,6 +44,7 @@ public final class E2EEnvironmentEngine {
private static final Collection<String> INITIALIZED_SUITES = new
HashSet<>();
+ @Getter(AccessLevel.NONE)
private final ContainerComposer containerComposer;
private final Map<String, DataSource> actualDataSourceMap;
@@ -57,10 +59,10 @@ public final class E2EEnvironmentEngine {
actualDataSourceMap = containerComposer.getActualDataSourceMap();
targetDataSource = containerComposer.getTargetDataSource();
expectedDataSourceMap = containerComposer.getExpectedDataSourceMap();
- executeLogicDatabaseInitSQLFileOnlyOnce(key, scenario, databaseType,
targetDataSource);
+ executeLogicDatabaseInitSQLFileOnlyOnce(key, scenario, databaseType);
}
- private void executeLogicDatabaseInitSQLFileOnlyOnce(final String key,
final String scenario, final DatabaseType databaseType, final DataSource
targetDataSource) {
+ private void executeLogicDatabaseInitSQLFileOnlyOnce(final String key,
final String scenario, final DatabaseType databaseType) {
Optional<String> logicDatabaseInitSQLFile = new
ScenarioDataPath(scenario).findActualDatabaseInitSQLFile(DefaultDatabase.LOGIC_NAME,
databaseType);
if (!logicDatabaseInitSQLFile.isPresent()) {
return;
