You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/09/10 12:53:26 UTC
(shardingsphere) branch master updated: Rename 20-env-initdb.sql (#36520)
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 bc2bad47835 Rename 20-env-initdb.sql (#36520)
bc2bad47835 is described below
commit bc2bad47835a5d3400baacbcc8510e86dc4759ce
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed Sep 10 20:53:20 2025 +0800
Rename 20-env-initdb.sql (#36520)
* Refactor StorageContainerConfigurationFactory
* Rename 20-env-initdb.sql
* Rename 20-env-initdb.sql
---
.../config/StorageContainerConfigurationFactory.java | 14 ++++++++++----
.../config/option/StorageContainerConfigurationOption.java | 6 +++---
.../dialect/H2StorageContainerConfigurationOption.java | 4 ++--
.../dialect/HiveStorageContainerConfigurationOption.java | 4 ++--
.../MariaDBStorageContainerConfigurationOption.java | 4 ++--
.../dialect/MySQLStorageContainerConfigurationOption.java | 5 ++---
.../OpenGaussStorageContainerConfigurationOption.java | 4 ++--
.../PostgreSQLStorageContainerConfigurationOption.java | 4 ++--
.../mariadb/init-sql/20-env-initdb.sql} | 0
.../mysql/init-sql/20-env-initdb.sql} | 0
.../mysql/init-sql/21-env-grant-xa-privilege.sql} | 0
.../opengauss/init-sql/20-env-initdb.sql} | 0
.../postgresql/init-sql/20-env-initdb.sql} | 0
13 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/StorageContainerConfigurationFactory.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/StorageContainerConfigurationFactory.java
index 95098b654de..aa8c429f7df 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/StorageContainerConfigurationFactory.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/StorageContainerConfigurationFactory.java
@@ -42,6 +42,8 @@ public final class StorageContainerConfigurationFactory {
private static final Collection<String> TO_BE_MOUNTED_COMMON_SQL_FILES = Arrays.asList("00-common-init-authority.sql", "99-common-check-ready.sql");
+ private static final String TO_BE_MOUNTED_STANDARD_ENV_SQL_FILE = "20-env-initdb.sql";
+
private static final String TO_BE_MOUNTED_ACTUAL_SCENARIO_SQL_FILE = "50-scenario-actual-init.sql";
private static final String TO_BE_MOUNTED_EXPECTED_SCENARIO_SQL_FILE = "60-scenario-expected-init.sql";
@@ -116,8 +118,12 @@ public final class StorageContainerConfigurationFactory {
for (String each : TO_BE_MOUNTED_COMMON_SQL_FILES) {
findToBeMountedCommonSQLFile(databaseType, each).ifPresent(optional -> result.put("/" + optional, "/docker-entrypoint-initdb.d/" + each));
}
- for (String each : option.getMountedSQLResources(findMajorVersion(option, majorVersion).orElse(0))) {
- getToBeMountedSQLFile(databaseType, each).ifPresent(optional -> result.put("/" + optional, "/docker-entrypoint-initdb.d/" + each));
+ String toBeMountedStandardEnvSQLFilePath = String.format("env/container/%s/init-sql/%s", databaseType.getType().toLowerCase(), TO_BE_MOUNTED_STANDARD_ENV_SQL_FILE);
+ if (null != Thread.currentThread().getContextClassLoader().getResource(toBeMountedStandardEnvSQLFilePath)) {
+ result.put("/" + toBeMountedStandardEnvSQLFilePath, "/docker-entrypoint-initdb.d/" + TO_BE_MOUNTED_STANDARD_ENV_SQL_FILE);
+ }
+ for (String each : option.getAdditionalMountedSQLEnvResources(findMajorVersion(option, majorVersion).orElse(0))) {
+ getToBeMountedEnvSQLFile(databaseType, each).ifPresent(optional -> result.put("/" + optional, "/docker-entrypoint-initdb.d/" + each));
}
for (String each : getToBeMountedScenarioSQLFiles(databaseType, scenario)) {
result.put("/" + each, "/docker-entrypoint-initdb.d/" + new File(each).getName());
@@ -130,8 +136,8 @@ public final class StorageContainerConfigurationFactory {
return null == Thread.currentThread().getContextClassLoader().getResource(toBeMountedFilePath) ? Optional.empty() : Optional.of(toBeMountedFilePath);
}
- private static Optional<String> getToBeMountedSQLFile(final DatabaseType databaseType, final String sqlFile) {
- String toBeMountedFilePath = String.format("env/%s/%s", databaseType.getType().toLowerCase(), sqlFile);
+ private static Optional<String> getToBeMountedEnvSQLFile(final DatabaseType databaseType, final String sqlFile) {
+ String toBeMountedFilePath = String.format("container/%s/init-sql/%s", databaseType.getType().toLowerCase(), sqlFile);
return null == Thread.currentThread().getContextClassLoader().getResource(toBeMountedFilePath) ? Optional.empty() : Optional.of(toBeMountedFilePath);
}
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/StorageContainerConfigurationOption.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/StorageContainerConfigurationOption.java
index 952fb6662ab..aa6e3a4166b 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/StorageContainerConfigurationOption.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/StorageContainerConfigurationOption.java
@@ -48,12 +48,12 @@ public interface StorageContainerConfigurationOption {
Collection<String> getMountedConfigurationResources();
/**
- * Get mounted SQL resources.
+ * Get additional mounted env SQL resources.
*
* @param majorVersion major version
- * @return mounted SQL resources
+ * @return additional mounted env SQL resources
*/
- Collection<String> getMountedSQLResources(int majorVersion);
+ Collection<String> getAdditionalMountedSQLEnvResources(int majorVersion);
/**
* Whether embedded storage container.
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/H2StorageContainerConfigurationOption.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/H2StorageContainerConfigurationOption.java
index b14e9d54f47..6dc0ab7f2af 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/H2StorageContainerConfigurationOption.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/H2StorageContainerConfigurationOption.java
@@ -45,8 +45,8 @@ public final class H2StorageContainerConfigurationOption implements StorageConta
}
@Override
- public Collection<String> getMountedSQLResources(final int majorVersion) {
- return Collections.singleton("01-initdb.sql");
+ public Collection<String> getAdditionalMountedSQLEnvResources(final int majorVersion) {
+ return Collections.emptyList();
}
@Override
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/HiveStorageContainerConfigurationOption.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/HiveStorageContainerConfigurationOption.java
index c9e07a5610d..4bf0fe05f08 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/HiveStorageContainerConfigurationOption.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/HiveStorageContainerConfigurationOption.java
@@ -50,8 +50,8 @@ public final class HiveStorageContainerConfigurationOption implements StorageCon
}
@Override
- public Collection<String> getMountedSQLResources(final int majorVersion) {
- return Collections.singleton("01-initdb.sql");
+ public Collection<String> getAdditionalMountedSQLEnvResources(final int majorVersion) {
+ return Collections.emptyList();
}
@Override
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MariaDBStorageContainerConfigurationOption.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MariaDBStorageContainerConfigurationOption.java
index 6c5ff12e8c9..d81ed5f3bad 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MariaDBStorageContainerConfigurationOption.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MariaDBStorageContainerConfigurationOption.java
@@ -50,8 +50,8 @@ public final class MariaDBStorageContainerConfigurationOption implements Storage
}
@Override
- public Collection<String> getMountedSQLResources(final int majorVersion) {
- return Collections.singleton("01-initdb.sql");
+ public Collection<String> getAdditionalMountedSQLEnvResources(final int majorVersion) {
+ return Collections.emptyList();
}
@Override
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MySQLStorageContainerConfigurationOption.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MySQLStorageContainerConfigurationOption.java
index a4b09ac35c5..b257fb43ab4 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MySQLStorageContainerConfigurationOption.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MySQLStorageContainerConfigurationOption.java
@@ -52,11 +52,10 @@ public final class MySQLStorageContainerConfigurationOption implements StorageCo
}
@Override
- public Collection<String> getMountedSQLResources(final int majorVersion) {
+ public Collection<String> getAdditionalMountedSQLEnvResources(final int majorVersion) {
Collection<String> result = new LinkedList<>();
- result.add("01-initdb.sql");
if (majorVersion > 5) {
- result.add("02-grant-xa-privilege.sql");
+ result.add("21-env-grant-xa-privilege.sql");
}
return result;
}
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/OpenGaussStorageContainerConfigurationOption.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/OpenGaussStorageContainerConfigurationOption.java
index 1ee3ce28636..fea1b181a43 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/OpenGaussStorageContainerConfigurationOption.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/OpenGaussStorageContainerConfigurationOption.java
@@ -47,8 +47,8 @@ public final class OpenGaussStorageContainerConfigurationOption implements Stora
}
@Override
- public Collection<String> getMountedSQLResources(final int majorVersion) {
- return Collections.singleton("01-initdb.sql");
+ public Collection<String> getAdditionalMountedSQLEnvResources(final int majorVersion) {
+ return Collections.emptyList();
}
@Override
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/PostgreSQLStorageContainerConfigurationOption.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/PostgreSQLStorageContainerConfigurationOption.java
index d2848734198..5fab35cf812 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/PostgreSQLStorageContainerConfigurationOption.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/PostgreSQLStorageContainerConfigurationOption.java
@@ -50,8 +50,8 @@ public final class PostgreSQLStorageContainerConfigurationOption implements Stor
}
@Override
- public Collection<String> getMountedSQLResources(final int majorVersion) {
- return Collections.singleton("01-initdb.sql");
+ public Collection<String> getAdditionalMountedSQLEnvResources(final int majorVersion) {
+ return Collections.emptyList();
}
@Override
diff --git a/test/e2e/operation/pipeline/src/test/resources/env/mariadb/01-initdb.sql b/test/e2e/operation/pipeline/src/test/resources/env/container/mariadb/init-sql/20-env-initdb.sql
similarity index 100%
rename from test/e2e/operation/pipeline/src/test/resources/env/mariadb/01-initdb.sql
rename to test/e2e/operation/pipeline/src/test/resources/env/container/mariadb/init-sql/20-env-initdb.sql
diff --git a/test/e2e/operation/pipeline/src/test/resources/env/mysql/01-initdb.sql b/test/e2e/operation/pipeline/src/test/resources/env/container/mysql/init-sql/20-env-initdb.sql
similarity index 100%
rename from test/e2e/operation/pipeline/src/test/resources/env/mysql/01-initdb.sql
rename to test/e2e/operation/pipeline/src/test/resources/env/container/mysql/init-sql/20-env-initdb.sql
diff --git a/test/e2e/operation/pipeline/src/test/resources/env/mysql/02-grant-xa-privilege.sql b/test/e2e/operation/pipeline/src/test/resources/env/container/mysql/init-sql/21-env-grant-xa-privilege.sql
similarity index 100%
rename from test/e2e/operation/pipeline/src/test/resources/env/mysql/02-grant-xa-privilege.sql
rename to test/e2e/operation/pipeline/src/test/resources/env/container/mysql/init-sql/21-env-grant-xa-privilege.sql
diff --git a/test/e2e/operation/pipeline/src/test/resources/env/opengauss/01-initdb.sql b/test/e2e/operation/pipeline/src/test/resources/env/container/opengauss/init-sql/20-env-initdb.sql
similarity index 100%
rename from test/e2e/operation/pipeline/src/test/resources/env/opengauss/01-initdb.sql
rename to test/e2e/operation/pipeline/src/test/resources/env/container/opengauss/init-sql/20-env-initdb.sql
diff --git a/test/e2e/operation/pipeline/src/test/resources/env/postgresql/01-initdb.sql b/test/e2e/operation/pipeline/src/test/resources/env/container/postgresql/init-sql/20-env-initdb.sql
similarity index 100%
rename from test/e2e/operation/pipeline/src/test/resources/env/postgresql/01-initdb.sql
rename to test/e2e/operation/pipeline/src/test/resources/env/container/postgresql/init-sql/20-env-initdb.sql